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

[Daniel Baumann]

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

    Add mountkernfs.sh and mountall.sh to the list of services disabled in lxc containers.
    
    These initscriopts unconditionaly mounts a tmpfs on /run which stops lxc-halt
    and lxc-start from communicating with the container init.
    
    Mounting filesystems at boot is better done in the lxc configuration file
    anyway.

diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index 713e173..7cb0304 100755
--- a/scripts/debconfig/0030-sysvinit
+++ b/scripts/debconfig/0030-sysvinit
@@ -16,7 +16,7 @@ Defaults ()
 {
 	_LXC_ENABLE="${_LXC_ENABLE:-false}"
 	_LXC_CONSOLES="${_LXC_CONSOLES:-6}"
-	_LXC_DISABLE_SERVICES="${_LXC_DISABLE_SERVICES:-checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools umountfs umountroot}"
+	_LXC_DISABLE_SERVICES="${_LXC_DISABLE_SERVICES:-checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools mountall.sh mountkernfs.sh umountfs umountroot}"
 }
 
 db_get live-debconfig/sysvinit/lxc-enable
diff --git a/scripts/debconfig/0030-sysvinit.templates b/scripts/debconfig/0030-sysvinit.templates
index 0754ff6..cf68195 100644
--- a/scripts/debconfig/0030-sysvinit.templates
+++ b/scripts/debconfig/0030-sysvinit.templates
@@ -20,9 +20,9 @@ Description: live-debconfig: How many consoles for LXC?
 
 Template: live-debconfig/sysvinit/lxc-disable-services
 Type: string
-Default: checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools umountfs umountroot
+Default: checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools mountall.sh mountkernfs.sh umountfs umountroot
 Description: live-debconfig: Which services to disable for LXC?
  Some services are not useful in containers and should be disabled.
  .
- This defaults to checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools
+ This defaults to checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools mountkernfs.sh mountall.sh
  umountfs umountroot.

-- 
live-debconfig