[SCM] live-debconfig branch, debian, updated. debian/4.0_a1-1-6-g91eba35

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 0568ac9c7e4ecc9b5de3f786af570faee9e93eed
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 6 02:06:41 2012 +0200

    Explicitly listing umountfs and umountroot for remove in sysvinit script to be on the conservative side, instead of using 'umount*' pattern to match them.
    
    When doing LXC things we need to be extra cautious, better to need to
    update the harcoded list (and thus relying on getting updates to the
    users to update them for newer sysvinit versions) rather than to need
    the update to prevent errors (and thus not relying on getting updates
    to the users to fix their systems).

diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index d63e483..713e173 100755
--- a/scripts/debconfig/0030-sysvinit
+++ b/scripts/debconfig/0030-sysvinit
@@ -141,13 +141,16 @@ case "${_LXC_ENABLE}" in
 		for _SERVICE in ${_LXC_DISABLE_SERVICES}
 		do
 			case ${_SERVICE} in
-				umount*)
+				umountfs|umountroot)
+					# FIXME: not upgrade safe
 					_ACTION=remove
 					;;
+
 				*)
 					_ACTION=disable
 					;;
 			esac
+
 			if [ -e "/etc/init.d/${_SERVICE}" ]
 			then
 				update-rc.d -f ${_SERVICE} ${_ACTION} 2>&1 | \

-- 
live-debconfig