Fix placement of update-grub undiversion

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".
amd64-kernel-on-i386
Colin Watson 5 years ago
parent 9584b2bf93
commit ce58687eed

@ -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 ${*}

Loading…
Cancel
Save