feat: handle files in /etc better
This commit is contained in:
parent
996084e146
commit
0976e092b5
1 changed files with 2 additions and 3 deletions
|
@ -28,16 +28,15 @@ run_latehook() {
|
|||
if [[ -f /new_root/.etc-stage ]]; then
|
||||
# Create 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 l -print0 | grep -Fxvz -f <(cd "/new_root/.update_rootfs/etc" && find . -type l) | xargs -0 rm -f)
|
||||
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/.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
|
||||
rm -rf /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/.new_etc /new_root/etc
|
||||
|
||||
|
|
Loading…
Reference in a new issue