[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a4-1-2-g750894d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 750894d4ebef2f3ec86dfacef2274709c698aa83
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 20 11:06:46 2012 +0200

    Setting conditional defaults for lxc when being called from an lxc template script.

diff --git a/scripts/debconfig/0020-ifupdown b/scripts/debconfig/0020-ifupdown
index 26bf96a..8fed7bf 100755
--- a/scripts/debconfig/0020-ifupdown
+++ b/scripts/debconfig/0020-ifupdown
@@ -21,7 +21,15 @@ DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
 
 Defaults ()
 {
-	_LO_ENABLE="${_LO_ENABLE:-true}"
+	case "${LIVE_DEBCONFIG_LXC}" in
+		true)
+			_LO_ENABLE="${_LO_ENABLE:-false}"
+			;;
+
+		*)
+			_LO_ENABLE="${_LO_ENABLE:-true}"
+			;;
+	esac
 
 	_ETH0_METHOD="${_ETH0_METHOD:-dhcp}"
 	_ETH0_ADDRESS="${_ETH0_ADDRESS:-192.168.1.2}"
diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index 94f6126..e431593 100755
--- a/scripts/debconfig/0030-sysvinit
+++ b/scripts/debconfig/0030-sysvinit
@@ -16,7 +16,16 @@ DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
 
 Defaults ()
 {
-	_LXC_ENABLE="${_LXC_ENABLE:-false}"
+	case "${LIVE_DEBCONFIG_LXC}" in
+		true)
+			_LXC_ENABLE="${_LXC_ENABLE:-true}"
+			;;
+
+		*)
+			_LXC_ENABLE="${_LXC_ENABLE:-false}"
+			;;
+	esac
+
 	_LXC_CONSOLES="${_LXC_CONSOLES:-6}"
 	_LXC_DISABLE_SERVICES="${_LXC_DISABLE_SERVICES:-checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools mountall.sh mountkernfs.sh umountfs umountroot}"
 }
diff --git a/scripts/debconfig/0040-util-linux b/scripts/debconfig/0040-util-linux
index 9d93a3d..790d231 100755
--- a/scripts/debconfig/0040-util-linux
+++ b/scripts/debconfig/0040-util-linux
@@ -25,7 +25,15 @@ Defaults ()
 			_HWCLOCKACCESS="${_HWCLOCKACCESS:-${HWCLOCKACCESS}}"
 		fi
 
-		_HWCLOCKACCESS="${_HWCLOCKACCESS:-yes}"
+		case "${LIVE_DEBCONFIG_LXC}" in
+			true)
+				_LXC_ENABLE="${_LXC_ENABLE:-no}"
+				;;
+
+			*)
+				_LXC_ENABLE="${_LXC_ENABLE:-yes}"
+				;;
+		esac
 	fi
 }
 

-- 
live-debconfig