From f37df2683267b9fb757e63e1325b01ca65a7a599 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 18 Feb 2018 16:03:05 +0100 Subject: Making container debconf create script aware of multiple subdirectories below /etc/container-tools/debconf when showing the list of preseed files to the user. Signed-off-by: Daniel Baumann --- share/scripts/debconf.d/0001-preseed-file | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file index 0f68622..804f328 100755 --- a/share/scripts/debconf.d/0001-preseed-file +++ b/share/scripts/debconf.d/0001-preseed-file @@ -43,13 +43,13 @@ 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 -elif ls "${CONFIG}"/*.cfg > /dev/null 2>&1 +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, # 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 "$(basename ${FILE} .cfg), "; done | sed -e 's|, $||')" + PRESEED_FILES="$(for FILE in ${FILES}; do echo -n "$(echo ${FILE} | sed -e 's|.cfg$||'), "; done | sed -e 's|, $||')" if [ -n "${PRESEED_FILES}" ] then -- cgit v1.2.3