summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-10-31 18:56:24 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-11-01 03:35:15 +0000
commit2085646423ee32ffffea046a3d887892498d792a (patch)
tree83fe2cb9b5259e667825f1d1a5ec3c8f1f2e9085
parentAdding container create pre-hook that can be used to automatically git pull /... (diff)
downloadcompute-tools-2085646423ee32ffffea046a3d887892498d792a.tar.xz
compute-tools-2085646423ee32ffffea046a3d887892498d792a.zip
Avoiding to display .cfg extension for preseed files in container debconf create script.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xshare/scripts/debconf.d/0001-preseed-file4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file
index 663fdc8..d3cc49d 100755
--- a/share/scripts/debconf.d/0001-preseed-file
+++ b/share/scripts/debconf.d/0001-preseed-file
@@ -36,7 +36,7 @@ then
# showing debconf selection dialog for global preseed file.
FILES="$(cd ${CONFIG} && find . -type f -name '*.cfg' -printf '%P\n' | sort)"
- PRESEED_FILES="$(for FILE in ${FILES}; do echo -n "${FILE}, "; done | sed -e 's|, $||')"
+ PRESEED_FILES="$(for FILE in ${FILES}; do echo -n "$(basename ${FILE} .cfg), "; done | sed -e 's|, $||')"
if [ -n "${PRESEED_FILES}" ]
then
@@ -55,7 +55,7 @@ then
*)
# user specified preseed file through debconf select
- db_set cnt-debconf/preseed-file "${CONFIG}/${PRESEED_FILE}"
+ db_set cnt-debconf/preseed-file "${CONFIG}/${PRESEED_FILE}.cfg"
db_fset cnt-debconf/preseed-file seen true
;;
esac