feat: handle files in /etc better

This commit is contained in:
Rudra B.S. 2023-11-22 13:16:14 +05:30
parent 996084e146
commit 0976e092b5

View file

@ -28,16 +28,15 @@ run_latehook() {
if [[ -f /new_root/.etc-stage ]]; then if [[ -f /new_root/.etc-stage ]]; then
# Create new /etc. # Create new /etc.
rm -rf /new_root/.new_etc rm -rf /new_root/.new_etc
cp -a /new_root/etc /new_root/.new_etc
(cd /new_root/.new_etc && find . -type f -print0 | grep -Fxvz -f <(cd "/new_root/.update_rootfs/etc" && find . -type f) | xargs -0 rm -f) (cd /new_root/.new_etc && find . -type f -print0 | grep -Fxvz -f <(cd "/new_root/.update_rootfs/etc" && find . -type f) | xargs -0 rm -f)
(cd /new_root/.new_etc && find . -type l -print0 | grep -Fxvz -f <(cd "/new_root/.update_rootfs/etc" && find . -type l) | xargs -0 rm -f) (cd /new_root/.new_etc && find . -type l -print0 | grep -Fxvz -f <(cd "/new_root/.update_rootfs/etc" && find . -type l) | xargs -0 rm -f)
mkdir -p /.old.varlib mkdir -p /.old.varlib
(cd /new_root/var/lib && find . -maxdepth 1 -type d -print0 | grep -Fxvz -f <(cd "/new_root/.update_rootfs/var/lib" && find . -maxdepth 1 -type d) | grep -Fxvz './pacman' | xargs -0 sh -c 'mv "$@" /new_root/.old.varlib' sh) (cd /new_root/var/lib && find . -maxdepth 1 -type d -print0 | grep -Fxvz -f <(cd "/new_root/.update_rootfs/var/lib" && find . -maxdepth 1 -type d) | grep -Fxvz './pacman' | xargs -0 sh -c 'mv "$@" /new_root/.old.varlib' sh)
(cd /new_root/.update_rootfs/var/lib && find . -maxdepth 1 -type d -print0 | grep -Fxvz -f <(cd "/new_root/var/lib" && find . -maxdepth 1 -type d) | xargs -0 sh -c 'mv "$@" /new_root/var/lib' sh) (cd /new_root/.update_rootfs/var/lib && find . -maxdepth 1 -type d -print0 | grep -Fxvz -f <(cd "/new_root/var/lib" && find . -maxdepth 1 -type d) | xargs -0 sh -c 'cp -r "$@" /new_root/var/lib' sh)
cp /new_root/.update_rootfs/etc/pacman.conf /new_root/.new_etc/pacman.conf cp /new_root/.update_rootfs/etc/pacman.conf /new_root/.new_etc/pacman.conf
rm -rf /new_root/.new_etc/pacman.d rm -rf /new_root/.new_etc/pacman.d
cp -a /new_root/.update_rootfs/etc/pacman.d /new_root/.new_etc/pacman.d cp -a /new_root/.update_rootfs/etc/pacman.d /new_root/.new_etc/pacman.d
cp -an /new_root/.update_rootfs/etc/* /new_root/.new_etc (cd /new_root/.update_rootfs/etc && find . -type f -print0 | grep -Fxvz -f <(cd "/new_root/.new_etc" && find . -type f -print0) | xargs -0 sh -c 'cp "$@" /new_root/.new_etc' sh)
mv /new_root/etc /new_root/.old.etc || : mv /new_root/etc /new_root/.old.etc || :
mv /new_root/.new_etc /new_root/etc mv /new_root/.new_etc /new_root/etc