summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-07-27 05:04:41 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-08-04 03:26:00 +0000
commitc5e549e7ebe20b58dd1011ccb4263ae52c0fab9c (patch)
tree94842b93cb3f1a61cd675aa322e4e7f48e2011c4
parentMerging upstream version 20210804. (diff)
downloadopen-infrastructure-compute-tools-c5e549e7ebe20b58dd1011ccb4263ae52c0fab9c.tar.xz
open-infrastructure-compute-tools-c5e549e7ebe20b58dd1011ccb4263ae52c0fab9c.zip
Updating debconf handling to honor container.conf.d files.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/open-infrastructure-container-tools.config14
1 files changed, 10 insertions, 4 deletions
diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config
index 2dc080c..0139c05 100644
--- a/debian/open-infrastructure-container-tools.config
+++ b/debian/open-infrastructure-container-tools.config
@@ -2,7 +2,7 @@
set -e
-CONFFILE="/etc/compute-tools/container.conf"
+CONFFILES="/etc/compute-tools/container.conf /etc/compute-tools/container.conf.d/*.conf"
. /usr/share/debconf/confmodule
@@ -40,10 +40,16 @@ then
db_go
fi
-if [ -e "${CONFFILE}" ]
-then
- . ${CONFFILE} || true
+for CONFFILE in ${CONFFILES}
+do
+ if [ -e "${CONFFILE}" ]
+ then
+ . ${CONFFILE} || true
+ fi
+done
+if [ -n "${IRK_TARGETS}" ]
+then
db_set open-infrastructure-container-tools/irc "${IRK_TARGETS}"
fi