root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso] don't allow manipulating the pkg cache

Browse source
This commit is contained in:
udeved 2016-03-03 22:43:24 +01:00
parent ae120c5187
commit a904569135
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/util-iso.sh
View file

@ -161,9 +161,10 @@ make_iso() {
touch "${work_dir}/iso/.miso"
for d in $(find "${work_dir}" -maxdepth 1 -type d -name '[^.]*'); do
if [[ "$d" != "${work_dir}/iso" ]] && \
[[ "${d##*/}" != "iso" ]] && \
[[ "${d##*/}" != "efiboot" ]] && \
[[ "$d" != "${work_dir}" ]]; then
[[ "${d##*/}" != "iso" ]] && \
[[ "${d##*/}" != "efiboot" ]] && \
[[ "$d" != "${work_dir}" ]]; then
clean_up_image "$d"
make_sqfs "$d"
fi
done
@ -217,7 +218,7 @@ make_image_root() {
copy_overlay "${profile_dir}/root-overlay" "${path}"
configure_root_image "${path}"
${is_custom_pac_conf} && clean_pacman_conf "${path}"
clean_up_image "${path}"
: > ${work_dir}/build.${FUNCNAME}
msg "Done [Base installation] (root-image)"
fi
@ -241,7 +242,6 @@ make_image_custom() {
umount_image
clean_up_image "${path}"
: > ${work_dir}/build.${FUNCNAME}
msg "Done [Desktop installation] (%s-image)" "${profile}"
fi
@ -274,7 +274,7 @@ make_image_live() {
# Clean up GnuPG keys
rm -rf "${path}/etc/pacman.d/gnupg"
clean_up_image "${path}"
: > ${work_dir}/build.${FUNCNAME}
msg "Done [Live installation] (live-image)"
fi
@ -305,8 +305,6 @@ make_image_mhwd() {
umount_image
clean_up_mhwd_image "${path}"
: > ${work_dir}/build.${FUNCNAME}
msg "Done [drivers repository] (mhwd-image)"
fi