From e6421a6abb6e1aed9ffa10ed96ade22a9a0d4881 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 19 Jun 2016 11:36:33 +0200
Subject: Always writing cnt.auto= default values to configuration files in
 debconf container create script.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/scripts/debconf.d/0003-debconf | 14 ++++++++------
 1 file 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
-- 
cgit v1.2.3