diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2016-05-26 09:15:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2016-06-03 11:37:20 +0000 |
| commit | 504b458e5950c4309e808604eb7ab7af204d0c0e (patch) | |
| tree | 4201af119376105298381da7786573ad1e7cb98e | |
| parent | Guessing default container script from /usr/share/container-tools/scripts/def... (diff) | |
| download | compute-tools-504b458e5950c4309e808604eb7ab7af204d0c0e.tar.xz compute-tools-504b458e5950c4309e808604eb7ab7af204d0c0e.zip | |
Using .cfg suffix for preseed files of debconf script for consistency.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
| -rwxr-xr-x | share/scripts/debconf.d/0001-preseed-file | 4 |
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 82d2049..03976d2 100755 --- a/share/scripts/debconf.d/0001-preseed-file +++ b/share/scripts/debconf.d/0001-preseed-file @@ -30,12 +30,12 @@ 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 -elif ls "${CONFIG}"/* > /dev/null 2>&1 +elif ls "${CONFIG}"/*.cfg > /dev/null 2>&1 then # user has not specified preseed files through commandline option, # showing debconf selection dialog for global preseed file. - FILES="$(cd ${CONFIG} && find * -not -type d -and -not -name '*.cfg' -and -not -name '*.in' -and -not -name '*.sh')" + 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|, $||')" if [ -n "${PRESEED_FILES}" ] |