summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorColin Watson <cjwatson@canonical.com>2011-05-21 10:50:09 +0200
committerDaniel Baumann <daniel@debian.org>2011-05-21 10:50:31 +0200
commit3f36f6ba4b513c892cb3b6f9f7da696ec357f49f (patch)
tree16684e701178f9144a52d82aafa4bfa6240494cc /scripts/build
parent26ad091b3e83a44a74b6c388148617cc81fc0b6f (diff)
downloadvyos-live-build-3f36f6ba4b513c892cb3b6f9f7da696ec357f49f.tar.gz
vyos-live-build-3f36f6ba4b513c892cb3b6f9f7da696ec357f49f.zip
Fix duplicate deconfiguration of apt, upstart, and sysv-rc if build-with-chroot is false (Closes: #627406).
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 0b4894195..738363dd8 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -93,15 +93,15 @@ if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
# Deconfiguring chroot
rm -f .stage/chroot_sources
+ 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 ${*}
fi
-lb chroot_apt remove ${*}
-lb chroot_sysv-rc remove ${*}
lb chroot_sysfs remove ${*}
-lb chroot_upstart remove ${*}
lb chroot_selinuxfs remove ${*}
lb chroot_proc remove ${*}
lb chroot_devpts remove ${*}