summaryrefslogtreecommitdiffstats
path: root/share/hooks/pre-build.git-pull.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-07-27 00:51:00 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-07-27 00:51:52 +0000
commitd3863ebc938d5db915283fe815f6a141e15e1ca7 (patch)
tree508a791beda2561ba5ead4f44c28ede71327d0fe /share/hooks/pre-build.git-pull.sh
parentHardening quoting in container main program. (diff)
downloadcompute-tools-d3863ebc938d5db915283fe815f6a141e15e1ca7.tar.xz
compute-tools-d3863ebc938d5db915283fe815f6a141e15e1ca7.zip
Supporting /etc/compute-tools/container.conf.d.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'share/hooks/pre-build.git-pull.sh')
-rwxr-xr-xshare/hooks/pre-build.git-pull.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/share/hooks/pre-build.git-pull.sh b/share/hooks/pre-build.git-pull.sh
index 744f955..d2cc152 100755
--- a/share/hooks/pre-build.git-pull.sh
+++ b/share/hooks/pre-build.git-pull.sh
@@ -31,10 +31,13 @@ do
then
echo "Updating ${DIRECTORY}..."
- if [ -e "/etc/${SOFTWARE}.conf" ]
- then
- . "/etc/${SOFTWARE}.conf"
- fi
+ for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf
+ do
+ if [ -e "${FILE}" ]
+ then
+ . "${FILE}"
+ fi
+ done
DEBCONF_ID="${DEBCONF_ID:-HEAD}"