Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-07 00:41:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

go back to only running lb_chroot_hacks on live layers

Browse Source 
otherwise each and every layer above a layer with a kernel gets its own
initramfs, which is silly.

Copy/paste the cruft cleaning bit of lb_chroot_hacks to be run on
non-live layers.
This commit is contained in:
Michael Hudson-Doyle 2021-06-30 14:37:18 +12:00
parent 653b925646
commit c4402139a2
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
live-build/lb_chroot_layered
View File

@ -158,7 +158,7 @@ create_chroot_pass () {
cp -a chroot.bootstrap/ "$overlay_dir/" cp -a chroot.bootstrap/ "$overlay_dir/"
fi fi
# Others have to be executed on every pass # Others have to be executed on every pass
rm -f .build/chroot_early_hooks .build/chroot_hooks .build/chroot_interactive .build/chroot_hacks rm -f .build/chroot_early_hooks .build/chroot_hooks .build/chroot_interactive
mkdir -p "$overlay_dir/" mkdir -p "$overlay_dir/"
lowerdirs=$(get_lowerdirs_for_pass $pass) lowerdirs=$(get_lowerdirs_for_pass $pass)
@ -241,7 +241,25 @@ create_chroot_pass () {
lb chroot_hooks ${*} lb chroot_hooks ${*}
lb chroot_hacks ${*} # Run chroot_hacks only on live layers. chroot_hacks is what repacks
# the initrd in a full casperized mode. We don't want to do that for
# each and every layer, just for the live layers (which
# lb_binary_layered will call lb binary_linux-image on).
if $(is_live_layer $pass); then
rm -f .build/chroot_hacks
lb chroot_hacks ${*}
else
# chroot_hacks also removes some cruft, which is appropriate for
# any layer so we copy and paste that bit here.
rm -f chroot/boot/initrd*bak*
rm -f chroot/etc/apt/trusted.gpg~
rm -f chroot/etc/group- chroot/etc/passwd-
rm -f chroot/etc/gshadow- chroot/etc/shadow-
rm -f chroot/var/cache/debconf/*-old
rm -f chroot/var/lib/dpkg/*-old
rm -f chroot/var/log/apt/term.log
rm -f chroot/etc/adjtime
fi
lb chroot_interactive ${*} lb chroot_interactive ${*}