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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 6a0831427d685efbb6ffb073301ac2ce6bd47e41
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 20 11:51:44 2012 +0200

    Adding preseed switch in order to not re-repeat questions in cases where live-debconf is preseed from live-build or lxc.

diff --git a/bin/live-debconfig b/bin/live-debconfig
index a4d2d40..bb623ea 100755
--- a/bin/live-debconfig
+++ b/bin/live-debconfig
@@ -62,10 +62,15 @@ EOF
 
 fi
 
-if [ "${1}" = "--noscripts" ]
-then
-	exit
-fi
+case "${1}" in
+	--noscripts)
+		exit 0
+		;;
+
+	--preseed)
+		PRESEED="true"
+		;;
+esac
 
 # Run debconf scripts
 for _SCRIPT in /lib/live/debconfig/*
diff --git a/scripts/debconfig/0010-hostname b/scripts/debconfig/0010-hostname
index 0f18ac5..7d36027 100755
--- a/scripts/debconfig/0010-hostname
+++ b/scripts/debconfig/0010-hostname
@@ -43,7 +43,7 @@ _HOSTNAME="${RET}" # string (w/o empty)
 Defaults
 
 db_set live-debconfig/hostname/hostname "${_HOSTNAME}"
-db_fset live-debconfig/hostname/hostname seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/hostname/hostname seen false
 
 db_settitle live-debconfig/title
 db_input high live-debconfig/hostname/hostname || true
diff --git a/scripts/debconfig/0020-ifupdown b/scripts/debconfig/0020-ifupdown
index 26bf96a..bafeee5 100755
--- a/scripts/debconfig/0020-ifupdown
+++ b/scripts/debconfig/0020-ifupdown
@@ -81,43 +81,43 @@ _NAMESERVER_OPTIONS="${RET}" # string (w/ empty)
 Defaults
 
 db_set live-debconfig/ifupdown/lo-enable "${_LO_ENABLE}"
-db_fset live-debconfig/ifupdown/lo-enable seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/lo-enable seen false
 
 db_set live-debconfig/ifupdown/lo-comment "${_LO_COMMENT}"
-db_fset live-debconfig/ifupdown/lo-comment seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/lo-comment seen false
 
 db_set live-debconfig/ifupdown/eth0-method "${_ETH0_METHOD}"
-db_fset live-debconfig/ifupdown/eth0-method seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/eth0-method seen false
 
 db_set live-debconfig/ifupdown/eth0-comment "${_ETH0_COMMENT}"
-db_fset live-debconfig/ifupdown/eth0-comment seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/eth0-comment seen false
 
 db_set live-debconfig/ifupdown/eth0-address "${_ETH0_ADDRESS}"
-db_fset live-debconfig/ifupdown/eth0-address seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/eth0-address seen false
 
 db_set live-debconfig/ifupdown/eth0-broadcast "${_ETH0_BROADCAST}"
-db_fset live-debconfig/ifupdown/eth0-broadcast seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/eth0-broadcast seen false
 
 db_set live-debconfig/ifupdown/eth0-gateway "${_ETH0_GATEWAY}"
-db_fset live-debconfig/ifupdown/eth0-gateway seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/eth0-gateway seen false
 
 db_set live-debconfig/ifupdown/eth0-netmask "${_ETH0_NETMASK}"
-db_fset live-debconfig/ifupdown/eth0-netmask seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/eth0-netmask seen false
 
 db_set live-debconfig/ifupdown/eth0-network "${_ETH0_NETWORK}"
-db_fset live-debconfig/ifupdown/eth0-network seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/eth0-network seen false
 
 db_set live-debconfig/ifupdown/nameserver-addresses "${_NAMESERVER_ADDRESSES}"
-db_fset live-debconfig/ifupdown/nameserver-addresses seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/nameserver-addresses seen false
 
 db_set live-debconfig/ifupdown/nameserver-domain "${_NAMESERVER_DOMAIN}"
-db_fset live-debconfig/ifupdown/nameserver-domain seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/nameserver-domain seen false
 
 db_set live-debconfig/ifupdown/nameserver-search "${_NAMESERVER_SEARCH}"
-db_fset live-debconfig/ifupdown/nameserver-search seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/nameserver-search seen false
 
 db_set live-debconfig/ifupdown/nameserver-options "${_NAMESERVER_OPTIONS}"
-db_fset live-debconfig/ifupdown/nameserver-options seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/ifupdown/nameserver-options seen false
 
 db_settitle live-debconfig/title
 db_input high live-debconfig/ifupdown/lo-enable || true
diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index 94f6126..24a379e 100755
--- a/scripts/debconfig/0030-sysvinit
+++ b/scripts/debconfig/0030-sysvinit
@@ -33,13 +33,13 @@ _LXC_DISABLE_SERVICES="${RET}" # string (w/o empty)
 Defaults
 
 db_set live-debconfig/sysvinit/lxc-enable "${_LXC_ENABLE}"
-db_fset live-debconfig/sysvinit/lxc-enable seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/sysvinit/lxc-enable seen false
 
 db_set live-debconfig/sysvinit/lxc-consoles "${_LXC_CONSOLES}"
-db_fset live-debconfig/sysvinit/lxc-consoles seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/sysvinit/lxc-consoles seen false
 
 db_set live-debconfig/sysvinit/lxc-disable-services "${_LXC_DISABLE_SERVICES}"
-db_fset live-debconfig/sysvinit/lxc-disable-services seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/sysvinit/lxc-disable-services seen false
 
 db_settitle live-debconfig/title
 db_input high live-debconfig/sysvinit/lxc-enable || true
diff --git a/scripts/debconfig/0040-util-linux b/scripts/debconfig/0040-util-linux
index 9d93a3d..59231a6 100755
--- a/scripts/debconfig/0040-util-linux
+++ b/scripts/debconfig/0040-util-linux
@@ -43,7 +43,7 @@ _HWCLOCKACCESS="${RET}" # boolean
 Defaults
 
 db_set live-debconfig/util-linux/hwclockaccess "${_HWCLOCKACCESS}"
-db_fset live-debconfig/util-linux/hwclockaccess seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/util-linux/hwclockaccess seen false
 
 db_settitle live-debconfig/title
 db_input high live-debconfig/util-linux/hwclockaccess || true
diff --git a/scripts/debconfig/0100-selinux b/scripts/debconfig/0100-selinux
index 818e3aa..b95df01 100755
--- a/scripts/debconfig/0100-selinux
+++ b/scripts/debconfig/0100-selinux
@@ -41,7 +41,7 @@ _SELINUX_ENABLE="${RET}" # boolean
 Defaults
 
 db_set live-debconfig/selinux/enable "${_SELINUX_ENABLE}"
-db_fset live-debconfig/selinux/enable seen false
+[ "${PRESEED}" ] || db_fset live-debconfig/selinux/enable seen false
 
 db_settitle live-debconfig/title
 db_input high live-debconfig/selinux/enable || true

-- 
live-debconfig