summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-09-07 14:48:25 +0200
committerDaniel Baumann <daniel@debian.org>2011-09-07 14:48:25 +0200
commited5212022c335ae6d18eefa8a40bbee2709ac34c (patch)
tree17f93cf037e202c7d5e999260fd5b690f7a9afb3 /scripts
parentdfaa4a67b55613087cd7beb80fb386a85f1c84f8 (diff)
downloadvyos-live-build-ed5212022c335ae6d18eefa8a40bbee2709ac34c.tar.gz
vyos-live-build-ed5212022c335ae6d18eefa8a40bbee2709ac34c.zip
Completing the restoring of the outer chroot when building in chrooted to not taint subsequent rebuilds of the binary stage with leftovers from the initial lb_binary_rootfs (Closes: #620953).
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_binary6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 0aaf26631..1649587b2 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -94,11 +94,13 @@ then
# Deconfiguring chroot
rm -f .stage/chroot_archives
lb chroot_apt remove ${*}
- lb chroot_upstart remove ${*}
- lb chroot_sysv-rc remove ${*}
lb chroot_hostname remove ${*}
lb chroot_resolv remove ${*}
lb chroot_hosts remove ${*}
+ lb chroot_upstart remove ${*}
+ lb chroot_sysv-rc remove ${*}
+ lb chroot_dpkg remove ${*}
+ lb chroot_debianchroot remove ${*}
fi
lb chroot_sysfs remove ${*}