From cfb5c24f96f6fa9f45fab986e382d6aa6aef7a55 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Thu, 1 Jun 2017 15:23:23 +0200
Subject: Renaming cnt.auto to cnt.container-server in order to split
 functionality of 'binding container to a specific host system' from 'starting
 container at system boot'.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/scripts/curl                   |  2 +-
 share/scripts/debconf                |  4 ++--
 share/scripts/debconf.d/0003-debconf | 12 ++++++------
 share/scripts/debootstrap            |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'share/scripts')

diff --git a/share/scripts/curl b/share/scripts/curl
index 18d49c0..357bddf 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -52,7 +52,7 @@ Parameters ()
 				shift 2
 				;;
 
-			--cnt.auto)
+			--cnt.container-server)
 				# ignore
 				shift 2
 				;;
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 8871fd8..2a43105 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -52,7 +52,7 @@ Parameters ()
 				shift 2
 				;;
 
-			--cnt.auto)
+			--cnt.container-server)
 				# ignore
 				shift 2
 				;;
@@ -925,7 +925,7 @@ Commands ()
 	HOSTNAME_SHORT="$(echo ${NAME} | cut -c-8)"
 	HOST_INTERFACE_NAME="$(echo ${NETWORK0_VETH:-veth-${HOSTNAME_SHORT}-0})"
 
-	sed -i -e "s|^cnt.auto=.*|cnt.auto=${CNT_AUTO}|" "${CONFIG}/${NAME}.conf"
+	sed -i -e "s|^cnt.container-server=.*|cnt.container-server=${CNT_CONTAINER_SERVER}|" "${CONFIG}/${NAME}.conf"
 	sed -i -e "s|^cnt.network-bridge=.*|cnt.network-bridge=${HOST_INTERFACE_NAME}:${NETWORK0_BRIDGE:-br0}|g" "${CONFIG}/${NAME}.conf"
 	sed -i -e "s|^cnt.overlay=.*|cnt.overlay=${CNT_OVERLAY}|g" "${CONFIG}/${NAME}.conf"
 	sed -i -e "s|^bind=.*|bind=${BIND}|" "${CONFIG}/${NAME}.conf"
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 76a71c8..a36720a 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -1006,20 +1006,20 @@ Internal_options ()
 
 	echo "HOST_COMMAND=\"${HOST_COMMAND}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
-	if db_get cnt-debconf/auto
+	if db_get cnt-debconf/container-server
 	then
-		CNT_AUTO="${RET:-FQDN}" # string (w/o empty)
+		CNT_CONTAINER_SERVER="${RET:-FQDN}" # string (w/o empty)
 	fi
 
-	CNT_AUTO="${CNT_AUTO:-FQDN}"
+	CNT_CONTAINER_SERVER="${CNT_CONTAINER_SERVER:-FQDN}"
 
-	case "${CNT_AUTO}" in
+	case "${CNT_CONTAINER_SERVER}" in
 		FQDN)
-			CNT_AUTO="$(hostname -f)"
+			CNT_CONTAINER_SERVER="$(hostname -f)"
 			;;
 	esac
 
-	echo "CNT_AUTO=\"${CNT_AUTO}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
+	echo "CNT_CONTAINER_SERVER=\"${CNT_CONTAINER_SERVER}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
 
 	if db_get cnt-debconf/bind
 	then
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index 79a3193..35b200f 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -51,7 +51,7 @@ Parameters ()
 				shift 2
 				;;
 
-			--cnt.auto)
+			--cnt.container-server)
 				# ignore
 				shift 2
 				;;
-- 
cgit v1.2.3