[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 076ed57ea9bffc86344512cd93a08bb66dd0723d
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Aug 5 17:52:43 2012 +0200

    Also adding kmod to disabled services within lxc containers in sysvinit script.

diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index 47a5e21..def1039 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 module-init-tools umountfs umountroot}"
+	_LXC_DISABLE_SERVICES="${_LXC_DISABLE_SERVICES:-checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools umountfs umountroot}"
 }
 
 db_get live-debconfig/sysvinit/lxc-enable
diff --git a/scripts/debconfig/0030-sysvinit.templates b/scripts/debconfig/0030-sysvinit.templates
index 6d00fc9..0754ff6 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 module-init-tools umountfs umountroot
+Default: checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools 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 module-init-tools
+ This defaults to checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools
  umountfs umountroot.

-- 
live-debconfig