[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a3-1-13-gb81b3af
Daniel Baumann
daniel at debian.org
Fri Aug 17 10:04:18 UTC 2012
The following commit has been merged in the debian-next branch:
commit b81b3afd68af2657387532683d1fd6161f2081c7
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Aug 17 12:03:33 2012 +0200
Removing default values from debconf templates since defaults are derived from scripts automatically and independently.
Otherwise, the debconf default would make debconf return empty in
which case we don't have any automatic default choosen at all.
diff --git a/scripts/debconfig/0010-hostname.templates b/scripts/debconfig/0010-hostname.templates
index 91d90f8..5261d02 100644
--- a/scripts/debconfig/0010-hostname.templates
+++ b/scripts/debconfig/0010-hostname.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
Template: live-debconfig/hostname/hostname
Type: string
-Default: debian
+Default:
Description: live-debconfig: Hostname?
What should be the hostname of the current system?
.
diff --git a/scripts/debconfig/0020-ifupdown b/scripts/debconfig/0020-ifupdown
index 382b3d3..b131095 100755
--- a/scripts/debconfig/0020-ifupdown
+++ b/scripts/debconfig/0020-ifupdown
@@ -20,8 +20,10 @@ set -e
Defaults ()
{
_LO_ENABLE="${_LO_ENABLE:-true}"
+
_ETH0_METHOD="${_ETH0_METHOD:-dhcp}"
_ETH0_ADDRESS="${_ETH0_ADDRESS:-192.168.1.2}"
+ _ETH0_NETMASK="${_ETH0_NETMASK:-255.255.255.0}"
if [ -e /etc/resolv.conf ]
then
@@ -54,7 +56,7 @@ db_get live-debconfig/ifupdown/eth0-gateway
_ETH0_GATEWAY="${RET}" # string (w/ empty)
db_get live-debconfig/ifupdown/eth0-netmask
-_ETH0_NETMASK="${RET}" # string (w/ empty)
+_ETH0_NETMASK="${RET}" # string (w/o empty)
db_get live-debconfig/ifupdown/eth0-network
_ETH0_NETWORK="${RET}" # string (w/ empty)
@@ -196,7 +198,7 @@ do
if db_get live-debconfig/ifupdown/eth${_NUMBER}-netmask
then
- eval _ETH${_NUMBER}_NETMASK="\"${RET}\"" # string (w/ empty)
+ eval _ETH${_NUMBER}_NETMASK="\"${RET}\"" # string (w/o empty)
fi
if db_get live-debconfig/ifupdown/eth${_NUMBER}-network
diff --git a/scripts/debconfig/0020-ifupdown.templates b/scripts/debconfig/0020-ifupdown.templates
index 7359908..1ba92e8 100644
--- a/scripts/debconfig/0020-ifupdown.templates
+++ b/scripts/debconfig/0020-ifupdown.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
Template: live-debconfig/ifupdown/lo-enable
Type: boolean
-Default: true
+Default:
Description: live-debconfig: Enable Loopback Interface?
Should the loopback interface be enabled?
.
@@ -26,7 +26,7 @@ Description: live-debconfig: Loopback Interface Comment?
Template: live-debconfig/ifupdown/eth0-method
Type: select
Choices: dhcp, static, none
-Default: dhcp
+Default:
Description: live-debconfig: Ethernet Interface Method?
What method should be used to configure the ethernet interface?
.
@@ -43,7 +43,7 @@ Description: live-debconfig: Ethernet Interface Comment?
Template: live-debconfig/ifupdown/eth0-address
Type: string
-Default: 192.168.1.2
+Default:
Description: live-debconfig: Ethernet IP Address?
What should be the IP address of the current system?
.
@@ -51,7 +51,7 @@ Description: live-debconfig: Ethernet IP Address?
Template: live-debconfig/ifupdown/eth0-broadcast
Type: string
-Default: 192.168.1.255
+Default:
Description: live-debconfig: Ethernet Broadcast Address?
What should be the broadcast address of the current system?
.
@@ -59,7 +59,7 @@ Description: live-debconfig: Ethernet Broadcast Address?
Template: live-debconfig/ifupdown/eth0-gateway
Type: string
-Default: 192.168.1.1
+Default:
Description: live-debconfig: Ethernet Gateway Address?
What should be the gateway address of the current system?
.
@@ -67,7 +67,7 @@ Description: live-debconfig: Ethernet Gateway Address?
Template: live-debconfig/ifupdown/eth0-netmask
Type: string
-Default: 255.255.255.0
+Default:
Description: live-debconfig: Ethernet Network Mask?
What should be the netmask of the current system?
.
@@ -75,7 +75,7 @@ Description: live-debconfig: Ethernet Network Mask?
Template: live-debconfig/ifupdown/eth0-network
Type: string
-Default: 192.168.1.0
+Default:
Description: live-debconfig: Ethernet Network Address?
What should be the network address of the current system?
.
diff --git a/scripts/debconfig/0030-sysvinit.templates b/scripts/debconfig/0030-sysvinit.templates
index cf68195..8cb19ca 100644
--- a/scripts/debconfig/0030-sysvinit.templates
+++ b/scripts/debconfig/0030-sysvinit.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
Template: live-debconfig/sysvinit/lxc-enable
Type: boolean
-Default: false
+Default:
Description: live-debconfig: Enable LXC?
Should Linux Container (LXC) support be enabled?
.
@@ -12,7 +12,7 @@ Description: live-debconfig: Enable LXC?
Template: live-debconfig/sysvinit/lxc-consoles
Type: string
-Default: 6
+Default:
Description: live-debconfig: How many consoles for LXC?
How many concurrent consoles should the current container provide?
.
@@ -20,7 +20,7 @@ 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 mountall.sh mountkernfs.sh umountfs umountroot
+Default:
Description: live-debconfig: Which services to disable for LXC?
Some services are not useful in containers and should be disabled.
.
diff --git a/scripts/debconfig/0040-util-linux.templates b/scripts/debconfig/0040-util-linux.templates
index 5e25c52..aa83b17 100644
--- a/scripts/debconfig/0040-util-linux.templates
+++ b/scripts/debconfig/0040-util-linux.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
Template: live-debconfig/util-linux/hwclockaccess
Type: boolean
-Default: yes
+Default:
Description: live-debconfig: access the hardware clock?
Is it possible to access the hardare clock?
.
diff --git a/scripts/debconfig/0100-selinux.templates b/scripts/debconfig/0100-selinux.templates
index 8c7363c..93d26c8 100644
--- a/scripts/debconfig/0100-selinux.templates
+++ b/scripts/debconfig/0100-selinux.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
Template: live-debconfig/selinux/enable
Type: boolean
-Default: false
+Default:
Description: live-debconfig: Enable SELinux?
Should Security-Enhanced Linux (SELinux) be enabled?
.
--
live-debconfig
More information about the debian-live-changes
mailing list