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

lb_chroot_layered: install archives on each layer

Browse Source 
also only call configure_universe after packages are installed.
This commit is contained in:
Michael Hudson-Doyle 2021-06-25 10:22:50 +12:00
parent 3a3558203b
commit 30cc2f1982
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
live-build/lb_chroot_layered
View File

@ -191,13 +191,7 @@ create_chroot_pass () {
lb chroot_resolv install ${*} lb chroot_resolv install ${*}
lb chroot_hostname install ${*} lb chroot_hostname install ${*}
lb chroot_apt install ${*} lb chroot_apt install ${*}
# Note: this triggers an upgrade + dist-ugprade; which may impact sublayers with more
# diff content than desired. So only running this on root pass.
# Only configure universe on root passes
if $(is_root_layer $pass); then
lb chroot_archives chroot install ${*} lb chroot_archives chroot install ${*}
configure_universe
fi
# Customizing chroot # Customizing chroot
lb chroot_linux-image ${*} lb chroot_linux-image ${*}
@ -247,14 +241,7 @@ create_chroot_pass () {
lb chroot_hooks ${*} lb chroot_hooks ${*}
# Run chroot_hacks only on root layers.
# chroot_hacks changes the mode of boot/initrd*. The side effect in
# layered mode is to create an initrd on each layer with a significant
# impact on image size (+30MB per layer). This is an issue even with
# update-initramfs disabled.
if $(is_live_layer $pass); then
lb chroot_hacks ${*} lb chroot_hacks ${*}
fi
lb chroot_interactive ${*} lb chroot_interactive ${*}
@ -264,10 +251,8 @@ create_chroot_pass () {
Chroot chroot "dpkg-query -W" > chroot.packages.${pass} Chroot chroot "dpkg-query -W" > chroot.packages.${pass}
# Deconfiguring chroot
if $(is_root_layer $pass); then
lb chroot_archives chroot remove ${*} lb chroot_archives chroot remove ${*}
fi configure_universe
lb chroot_apt remove ${*} lb chroot_apt remove ${*}
lb chroot_hostname remove ${*} lb chroot_hostname remove ${*}
lb chroot_resolv remove ${*} lb chroot_resolv remove ${*}