From 1ea974603fb43cee3466161ab7de270ecac81242 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 May 2022 17:25:38 +0200 Subject: Explicitly prefering links subdirectory over other locations withint debconf hierarchy in debconf build scripts. Signed-off-by: Daniel Baumann --- share/build-scripts/debconf.d/0001-preseed-file | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/share/build-scripts/debconf.d/0001-preseed-file b/share/build-scripts/debconf.d/0001-preseed-file index 082958e..8e90943 100755 --- a/share/build-scripts/debconf.d/0001-preseed-file +++ b/share/build-scripts/debconf.d/0001-preseed-file @@ -35,9 +35,10 @@ export DEBCONF_NOWARNINGS # # 1. user specified a preseed file through commandline options # 2. /etc/compute-tools/debconf/${NAME}.cfg exists -# 3. /etc/compute-tools/debconf/*/${NAME}.cfg exists (only one file!) -# 4. /etc/compute-tools/debconf/default.cfg exists -# 5. user chooses from list of available (if any) *.cfg files +# 3. /etc/compute-tools/debconf/links/${NAME}.cfg exists +# 4. /etc/compute-tools/debconf/*/${NAME}.cfg exists (only one file!) +# 5. /etc/compute-tools/debconf/default.cfg exists +# 6. user chooses from list of available (if any) *.cfg files # (recursively) found in /etc/compute-tools/debconf, # /etc/compute-tools/debconf/links is excluded. @@ -52,6 +53,12 @@ then # available on the system matching the container name db_set container/preseed-file "${DEBCONF}/${NAME}.cfg" db_fset container/preseed-file seen true +elif [ -e "${DEBCONF}/links/${NAME}.cfg" ] +then + # user did not specify a pressed file, but there is a matching one + # in /etc/${SOFTWARE}/debconf/links directory + db_set container/preseed-file "${DEBCONF}/${NAME}.cfg" + db_fset container/preseed-file seen true elif [ "$(ls ${DEBCONF}/*/${NAME}.cfg 2>/dev/null | wc -l)" -eq 1 ] then # user did not specify a pressed file, but there is 1 (and only 1) -- cgit v1.2.3