diff options
author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2019-02-17 17:31:15 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2019-02-23 15:22:21 +0000 |
commit | fecd16129e50515b09525b99766d1af0d4900d36 (patch) | |
tree | 0e50efa8e8f4b3197985e277a03874762413629a /share/scripts/debconf.d/0001-preseed-file | |
parent | Using get.open-infrastructure.net as default URL to get images from in contai... (diff) | |
download | compute-tools-fecd16129e50515b09525b99766d1af0d4900d36.tar.xz compute-tools-fecd16129e50515b09525b99766d1af0d4900d36.zip |
Harmonizing debconf values for container debconf create script.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'share/scripts/debconf.d/0001-preseed-file')
-rwxr-xr-x | share/scripts/debconf.d/0001-preseed-file | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file index 59855e9..d9ff245 100755 --- a/share/scripts/debconf.d/0001-preseed-file +++ b/share/scripts/debconf.d/0001-preseed-file @@ -32,14 +32,14 @@ export DEBCONF_NOWARNINGS if [ -n "${PRESEED_FILE}" ] then # user specified one or more preseed files through commandline option - db_set cnt-debconf/preseed-file "${PRESEED_FILE}" - db_fset cnt-debconf/preseed-file seen true + db_set container/preseed-file "${PRESEED_FILE}" + db_fset container/preseed-file seen true elif [ -e "${CONFIG}/${NAME}.cfg" ] then # user did not specify a pressed file, but there is a matching one # available on the system matching the container name - db_set cnt-debconf/preseed-file "${CONFIG}/${NAME}.cfg" - db_fset cnt-debconf/preseed-file seen true + db_set container/preseed-file "${CONFIG}/${NAME}.cfg" + db_fset container/preseed-file seen true elif [ "$(ls ${CONFIG}/*/${NAME}.cfg 2>/dev/null | wc -l)" -eq 1 ] then # user did not specify a pressed file, but there is 1 (and only 1) @@ -47,13 +47,13 @@ then FILE="$(ls ${CONFIG}/*/${NAME}.cfg)" - db_set cnt-debconf/preseed-file "${FILE}" - db_fset cnt-debconf/preseed-file seen true + db_set container/preseed-file "${FILE}" + db_fset container/preseed-file seen true elif [ -e "${CONFIG}/default.cfg" ] then # user did not specify a pressed file, but there is a default one - db_set cnt-debconf/preseed-file "${CONFIG}/default.cfg" - db_fset cnt-debconf/preseed-file seen true + db_set container/preseed-file "${CONFIG}/default.cfg" + db_fset container/preseed-file seen true elif ls "${CONFIG}"/*.cfg > /dev/null 2>&1 || ls "${CONFIG}"/*/*.cfg > /dev/null 2>&1 then # user has not specified preseed files through commandline option, @@ -64,13 +64,13 @@ then if [ -n "${PRESEED_FILES}" ] then - db_subst cnt-debconf/preseed-files CHOICES "none, custom, , ${PRESEED_FILES}" + db_subst container/preseed-files CHOICES "none, custom, , ${PRESEED_FILES}" - db_settitle cnt-debconf/title - db_input high cnt-debconf/preseed-files || true + db_settitle container/title + db_input high container/preseed-files || true db_go - db_get cnt-debconf/preseed-files + db_get container/preseed-files PRESEED_FILE="${RET}" # select case "${PRESEED_FILE}" in @@ -79,8 +79,8 @@ then *) # user specified preseed file through debconf select - db_set cnt-debconf/preseed-file "${CONFIG}/${PRESEED_FILE}.cfg" - db_fset cnt-debconf/preseed-file seen true + db_set container/preseed-file "${CONFIG}/${PRESEED_FILE}.cfg" + db_fset container/preseed-file seen true ;; esac fi @@ -92,11 +92,11 @@ case "${PRESEED_FILE}" in *) # ask user for a preseed file - db_settitle cnt-debconf/title - db_input high cnt-debconf/preseed-file || true + db_settitle container/title + db_input high container/preseed-file || true db_go - db_get cnt-debconf/preseed-file + db_get container/preseed-file PRESEED_FILE="${RET}" # string (w/ empty) echo "PRESEED_FILE=\"${PRESEED_FILE}\"" >> "${DEBCONF_TMPDIR}/debconf.default" |