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

util-iso-chroot: fix copy_from_cache()

Browse source
This commit is contained in:
udeved 2017-06-08 15:20:50 +02:00
parent be1b965c94
commit a1371dbd8a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -210,11 +210,11 @@ clean_up_image(){
copy_from_cache(){ copy_from_cache(){
local list="${tmp_dir}"/mhwd-cache.list local list="${tmp_dir}"/mhwd-cache.list
local mnt="$1" repo="$2" local mnt="$1" repo="$2"
shift 2
chroot-run "$mnt" pacman -v -Syw --noconfirm "$@" || return 1 chroot-run "$mnt" pacman -v -Syw --noconfirm "$@" || return 1
chroot-run "$mnt" pacman -v -Sp --noconfirm "$@" > "$list" chroot-run "$mnt" pacman -v -Sp --noconfirm "$@" > "$list"
sed -ni '/.pkg.tar.xz/p' "$list" sed -ni '/.pkg.tar.xz/p' "$list"
sed -i "s/.*\///" "$list" sed -i "s/.*\///" "$list"
msg2 "Copying mhwd package cache ..." msg2 "Copying mhwd package cache ..."
rsync -v --files-from="$list" /var/cache/pacman/pkg "$mnt$repo" rsync -v --files-from="$list" /var/cache/pacman/pkg "$mnt$repo"
} }
@ -225,11 +225,9 @@ chroot_clean(){
[[ -d ${root} ]] || continue [[ -d ${root} ]] || continue
local name=${root##*/} local name=${root##*/}
if [[ $name != "mhwdfs" ]];then if [[ $name != "mhwdfs" ]];then
# lock 9 "$name.lock" "Locking chroot copy [%s]" "$name"
delete_chroot "${root}" "$dest" delete_chroot "${root}" "$dest"
fi fi
done done
rm -rf --one-file-system "$dest" rm -rf --one-file-system "$dest"
} }