[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a4-1-1-g36bf003
Daniel Baumann
daniel at debian.org
Fri Aug 17 21:28:22 UTC 2012
The following commit has been merged in the debian-next branch:
commit 36bf003e7fa6d5c52696d8a28c536c204b67725e
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Aug 17 23:28:05 2012 +0200
Repeating debconf systemrc variable in all scripts to ease standalone testing.
diff --git a/bin/live-debconfig b/bin/live-debconfig
index d98a5bc..a4d2d40 100755
--- a/bin/live-debconfig
+++ b/bin/live-debconfig
@@ -73,6 +73,6 @@ do
if [ -x "${_SCRIPT}" ]
then
# FIXME: make scripts a multiselect
- DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc" "${_SCRIPT}"
+ "${_SCRIPT}"
fi
done
diff --git a/scripts/debconfig/0010-hostname b/scripts/debconfig/0010-hostname
index 81b3f9e..0f18ac5 100755
--- a/scripts/debconfig/0010-hostname
+++ b/scripts/debconfig/0010-hostname
@@ -10,6 +10,8 @@
set -e
+DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
+
. /usr/share/debconf/confmodule
Defaults ()
diff --git a/scripts/debconfig/0020-ifupdown b/scripts/debconfig/0020-ifupdown
index 6af5c2b..26bf96a 100755
--- a/scripts/debconfig/0020-ifupdown
+++ b/scripts/debconfig/0020-ifupdown
@@ -10,6 +10,8 @@
set -e
+DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
+
. /usr/share/debconf/confmodule
# FIXME:
diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index e50c6b7..94f6126 100755
--- a/scripts/debconfig/0030-sysvinit
+++ b/scripts/debconfig/0030-sysvinit
@@ -10,6 +10,8 @@
set -e
+DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
+
. /usr/share/debconf/confmodule
Defaults ()
diff --git a/scripts/debconfig/0040-util-linux b/scripts/debconfig/0040-util-linux
index a9018c0..9d93a3d 100755
--- a/scripts/debconfig/0040-util-linux
+++ b/scripts/debconfig/0040-util-linux
@@ -10,6 +10,8 @@
set -e
+DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
+
. /usr/share/debconf/confmodule
Defaults ()
diff --git a/scripts/debconfig/0100-selinux b/scripts/debconfig/0100-selinux
index 29059d0..818e3aa 100755
--- a/scripts/debconfig/0100-selinux
+++ b/scripts/debconfig/0100-selinux
@@ -10,6 +10,8 @@
set -e
+DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
+
. /usr/share/debconf/confmodule
Defaults ()
--
live-debconfig
More information about the debian-live-changes
mailing list