diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2017-06-01 13:23:23 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2017-06-29 08:46:20 +0000 |
| commit | 6c75eca760619440013078068d592c5bdc646e87 (patch) | |
| tree | a5616a206290ffce41af35c9c1c4a06e4c0dbafb /share/scripts/debconf.d/0003-debconf | |
| parent | Removing net-tools from host-setup documentation, it is a direct depends of c... (diff) | |
| download | compute-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 'share/scripts/debconf.d/0003-debconf')
| -rwxr-xr-x | share/scripts/debconf.d/0003-debconf | 18 |
1 files changed, 13 insertions, 5 deletions
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 |