Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-10 18:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix placement of update-grub undiversion

Browse Source 
Chroot deconfiguration should happen in the opposite order from chroot
configuration, so, for symmetry, undivert_grub should be called between
"lb chroot_debianchroot remove" and "lb chroot_sysfs remove".
This commit is contained in:
Colin Watson 2019-08-27 09:17:55 +01:00
parent 9584b2bf93
commit ce58687eed
1 changed files with 4 additions and 3 deletions

7
live-build/lb_chroot_layered

@ -249,9 +249,6 @@ create_chroot_pass () {
Chroot chroot "dpkg-query -W" > chroot.packages.${pass}
# Restore grub
undivert_grub chroot
# Deconfiguring chroot
if $(is_root_layer $pass); then
lb chroot_archives chroot remove ${*}
@ -263,6 +260,10 @@ create_chroot_pass () {
lb chroot_tmpfs remove ${*}
lb chroot_dpkg remove ${*}
lb chroot_debianchroot remove ${*}
# Restore grub
undivert_grub chroot
lb chroot_sysfs remove ${*}
lb chroot_proc remove ${*}
lb chroot_devpts remove ${*}