[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a1-1-4-g1faa894

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit d2b03f33fef721f455ea4fd498465bcdec83c326
Author: Jon Severinsson <jon at severinsson.net>
Date:   Sun Aug 5 19:16:17 2012 +0200

    Remove, rather than disable, the umount* initscripts in lxc containers.
    
    Required as disable is a no-op for initscripts that are only installed as K??* actions.
    NB: This is not as bullet-proof as it should be, uppgrading or reinstalling the initscripts package will restore them, and thus require the user to run live-debconfig again.

diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index def1039..d63e483 100755
--- a/scripts/debconfig/0030-sysvinit
+++ b/scripts/debconfig/0030-sysvinit
@@ -140,9 +140,17 @@ case "${_LXC_ENABLE}" in
 		# Remove pointless services in a container
 		for _SERVICE in ${_LXC_DISABLE_SERVICES}
 		do
+			case ${_SERVICE} in
+				umount*)
+					_ACTION=remove
+					;;
+				*)
+					_ACTION=disable
+					;;
+			esac
 			if [ -e "/etc/init.d/${_SERVICE}" ]
 			then
-				update-rc.d -f ${_SERVICE} disable 2>&1 | \
+				update-rc.d -f ${_SERVICE} ${_ACTION} 2>&1 | \
 				grep -v "update-rc.d: using dependency based boot sequencing" | \
 				grep -v "update-rc.d: error: cannot find a LSB script for mountroot" || true
 			fi

-- 
live-debconfig