summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-06-19 09:36:33 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-07-01 09:31:10 +0000
commite6421a6abb6e1aed9ffa10ed96ade22a9a0d4881 (patch)
treee7ddf1a3981f12454a2669e11caf1d496ecf2450
parentUsing global path definition in container version command for consistency. (diff)
downloadcompute-tools-e6421a6abb6e1aed9ffa10ed96ade22a9a0d4881.tar.xz
compute-tools-e6421a6abb6e1aed9ffa10ed96ade22a9a0d4881.zip
Always writing cnt.auto= default values to configuration files in debconf container create script.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xshare/scripts/debconf.d/0003-debconf14
1 files changed, 8 insertions, 6 deletions
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 05c9eb5..15a6a15 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -1045,14 +1045,16 @@ Internal_options ()
if db_get cnt-debconf/auto
then
CNT_AUTO="${RET:-FQDN}" # string (w/o empty)
-
- case "${CNT_AUTO}" in
- FQDN)
- CNT_AUTO="$(hostname -f)"
- ;;
- esac
fi
+ CNT_AUTO="${CNT_AUTO:-FQDN}"
+
+ case "${CNT_AUTO}" in
+ FQDN)
+ CNT_AUTO="$(hostname -f)"
+ ;;
+ esac
+
echo "CNT_AUTO=\"${CNT_AUTO}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
if db_get cnt-debconf/bind