Package: live-build Version: 3.0~a17-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu ubuntu-patch oneiric
The conditions for installing and removing various things at the start and end of lb_binary don't quite match up in the case where build-with-chroot is false. The effect of this in my build, which I noticed when diffing the chroot left behind by livecd-rootfs with that left behind by live-build, is that /sbin/initctl gets entirely removed from the chroot. It seems to me that the install/remove conditions should match. The attached patch fixes this. (The builder that builds Ubuntu live filesystems always does so in a current chroot matching the release it's building, so there's no point in using another nested chroot in our case.) Thanks, -- Colin Watson [cjwat...@ubuntu.com]
>From 7ecd0f223115cd51d8880564b6371681574c3dd5 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwat...@canonical.com> Date: Fri, 20 May 2011 12:39:59 +0100 Subject: [PATCH] Fix duplicate deconfiguration of apt, upstart, and sysv-rc if build-with-chroot is false. --- scripts/build/lb_binary | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary index 0b48941..738363d 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 ${*} -- 1.7.4.1