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

util-*-chroot: minor changes

Browse source
This commit is contained in:
udeved 2017-04-27 15:13:22 +02:00
parent 28c6d649aa
commit 952f516389
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -257,24 +257,30 @@ copy_from_cache(){
chroot_create(){
[[ "${1##*/}" == "rootfs" ]] && local flag="-L"
setarch "${target_arch}" \
mkchroot ${mkchroot_args[*]} ${flag} $@
mkchroot "${mkchroot_args[@]}" ${flag} $@
}
chroot_clean(){
msg "Cleaning chroot for [%s] (%s)..." "${target_branch}" "${target_arch}"
for root in "$1"/*fs; do
local dest="$1"
# msg "Cleaning chroot for [%s] (%s)..." "${target_branch}" "${target_arch}"
for root in "$dest"/*; do
[[ -d ${root} ]] || continue
local name=${root##*/}
if [[ $name != "mhwdfs" ]];then
stat_busy "Deleting chroot [%s] (%s) ..." "$name" "${1##*/}"
lock 9 "%s.lock" "Locking chroot '%s'" "${root}" "${root}"
slock 9 "%s.lock" "Locking chroot '%s'" "${root}" "${root}"
stat_busy "Deleting chroot [%s] (%s) ..." "${root}" "${root}"
subvolume_delete_recursive "${root}"
stat_done
lock_close 9
rm -rf --one-file-system "${root}"
rm -f "${root}.lock"
fi
done
lock_close 9
rm -rf --one-file-system "$1"
rm -rf --one-file-system "$dest"
}
prepare_initcpio(){

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

@ -148,12 +148,12 @@ chroot_init(){
local timer=$(get_timer)
local dest="$1"
init_base_devel
msg "Initialize chroot for [%s] (%s)..." "${target_branch}" "${target_arch}"
# msg "Initialize chroot for [%s] (%s)..." "${target_branch}" "${target_arch}"
mkdir -p "${dest}"
setarch "${target_arch}" \
mkchroot "${mkchroot_args[@]}" \
"${dest}/root" \
"${base_packages[@]}" || abort
${base_packages[*]} || abort
show_elapsed_time "${FUNCNAME}" "${timer}"
}