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

go back to only running 'lb chroot_archives' on root layers

Browse Source 
but still run configure_universe after archive removal, not before
This commit is contained in:
Michael Hudson-Doyle 2021-06-30 17:10:51 +12:00
parent c4402139a2
commit 18bf308be0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
live-build/lb_chroot_layered
View File

@ -191,7 +191,12 @@ 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 ${*}
lb chroot_archives chroot 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 ${*}
fi
# Customizing chroot # Customizing chroot
lb chroot_linux-image ${*} lb chroot_linux-image ${*}
@ -269,8 +274,11 @@ create_chroot_pass () {
Chroot chroot "dpkg-query -W" > chroot.packages.${pass} Chroot chroot "dpkg-query -W" > chroot.packages.${pass}
lb chroot_archives chroot remove ${*} # Deconfiguring chroot
configure_universe if $(is_root_layer $pass); then
lb chroot_archives chroot remove ${*}
configure_universe
fi
lb chroot_apt remove ${*} lb chroot_apt remove ${*}
lb chroot_hostname remove ${*} lb chroot_hostname remove ${*}
lb chroot_resolv remove ${*} lb chroot_resolv remove ${*}