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

util-*-chroot: update chroot_clean()

Browse source
This commit is contained in:
udeved 2017-04-26 22:56:49 +02:00
parent 3828892808
commit 69445b01f5
2 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/util-iso-chroot.sh
View file

@ -261,20 +261,19 @@ chroot_create(){
}
chroot_clean(){
msg "Cleaning up ..."
for image in "$1"/*fs; do
[[ -d ${image} ]] || continue
local name=${image##*/}
msg "Cleaning chroot for [%s] (%s)..." "${target_branch}" "${target_arch}"
for root in "$1"/*fs; do
[[ -d ${root} ]] || continue
local name=${root##*/}
if [[ $name != "mhwdfs" ]];then
msg2 "Deleting chroot [%s] (%s) ..." "$name" "${1##*/}"
lock 9 "${image}.lock" "Locking chroot '${image}'"
if [[ "$(stat -f -c %T "${image}")" == btrfs ]]; then
{ type -P btrfs && btrfs subvolume delete "${image}"; } #&> /dev/null
fi
rm -rf --one-file-system "${image}"
stat_busy "Deleting chroot [%s] (%s) ..." "$name" "${1##*/}"
lock 9 "%s.lock" "Locking chroot '%s'" "${root}" "${root}"
subvolume_delete_recursive "${root}"
rm -rf --one-file-system "${root}"
rm -f "${root}.lock"
fi
done
exec 9>&-
lock_close 9
rm -rf --one-file-system "$1"
}

22
lib/util-pkg-chroot.sh
View file

@ -117,18 +117,15 @@ chroot_create(){
chroot_clean(){
msg "Cleaning chroot for [%s] (%s)..." "${target_branch}" "${target_arch}"
for copy in "${work_dir}"/*; do
[[ -d ${copy} ]] || continue
msg2 "Deleting chroot copy %s ..." "$(basename "${copy}")"
lock 9 "${copy}.lock" "Locking chroot copy '${copy}'"
subvolume_delete_recursive "${copy}"
rm -rf --one-file-system "${copy}"
for root in "$1"/*; do
[[ -d ${root} ]] || continue
stat_busy "Deleting chroot copy %s ..." "${copy##*/}"
lock 9 "%s.lock" "Locking chroot copy '%s'" "${root}" "${root}"
subvolume_delete_recursive "${root}"
rm -rf --one-file-system "${root}"
done
exec 9>&-
rm -rf --one-file-system "${work_dir}"
lock_close 9
rm -rf --one-file-system "$1"
}
chroot_update(){
@ -136,7 +133,6 @@ chroot_update(){
chroot-run ${mkchroot_args[*]} \
"${work_dir}/${OWNER}" \
pacman -Syu --noconfirm || abort
}
clean_up(){
@ -200,7 +196,7 @@ post_build(){
chroot_init(){
local timer=$(get_timer)
if ${clean_first} || [[ ! -d "${work_dir}" ]]; then
chroot_clean
chroot_clean "${work_dir}"
chroot_create
else
chroot_update