summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-06-01 13:23:23 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-06-29 08:46:20 +0000
commit6c75eca760619440013078068d592c5bdc646e87 (patch)
treea5616a206290ffce41af35c9c1c4a06e4c0dbafb /share
parentRemoving net-tools from host-setup documentation, it is a direct depends of c... (diff)
downloadcompute-tools-6c75eca760619440013078068d592c5bdc646e87.tar.xz
compute-tools-6c75eca760619440013078068d592c5bdc646e87.zip
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>
Diffstat (limited to '')
-rw-r--r--share/config/container.conf.in1
-rwxr-xr-xshare/scripts/curl5
-rwxr-xr-xshare/scripts/debconf6
-rwxr-xr-xshare/scripts/debconf.d/0003-debconf18
-rwxr-xr-xshare/scripts/debootstrap5
5 files changed, 30 insertions, 5 deletions
diff --git a/share/config/container.conf.in b/share/config/container.conf.in
index bf1ecc5..322e2c9 100644
--- a/share/config/container.conf.in
+++ b/share/config/container.conf.in
@@ -2,6 +2,7 @@
[start]
cnt.auto=@CNT_AUTO@
+cnt.container-server=@CNT_CONTAINER_SERVER@
cnt.network-bridge=@CNT_NETWORK_BRIDGE@
cnt.overlay=@CNT_OVERLAY@
bind=@BIND@
diff --git a/share/scripts/curl b/share/scripts/curl
index 18d49c0..a338020 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -57,6 +57,11 @@ Parameters ()
shift 2
;;
+ --cnt.container-server)
+ # ignore
+ shift 2
+ ;;
+
-s|--script)
# ignore
shift 2
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 8871fd8..b6d881d 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -57,6 +57,11 @@ Parameters ()
shift 2
;;
+ --cnt.container-server)
+ # ignore
+ shift 2
+ ;;
+
-s|--script)
# ignore
shift 2
@@ -926,6 +931,7 @@ Commands ()
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..8e78b3e 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -1008,18 +1008,26 @@ Internal_options ()
if db_get cnt-debconf/auto
then
- CNT_AUTO="${RET:-FQDN}" # string (w/o empty)
+ CNT_AUTO="${RET:-true}" # string (w/o empty)
fi
- CNT_AUTO="${CNT_AUTO:-FQDN}"
+ CNT_AUTO="${CNT_AUTO:-true}"
+ echo "CNT_AUTO=\"${CNT_AUTO}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
+
+ if db_get cnt-debconf/container-server
+ then
+ CNT_CONTAINER_SERVER="${RET:-FQDN}" # string (w/o empty)
+ fi
+
+ 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..0c19d54 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -56,6 +56,11 @@ Parameters ()
shift 2
;;
+ --cnt.container-server)
+ # ignore
+ shift 2
+ ;;
+
-s|--script)
# ignore
shift 2