From c5e549e7ebe20b58dd1011ccb4263ae52c0fab9c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 27 Jul 2021 07:04:41 +0200 Subject: Updating debconf handling to honor container.conf.d files. Signed-off-by: Daniel Baumann --- debian/open-infrastructure-container-tools.config | 14 ++++++++++---- 1 file 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 -- cgit v1.2.3