summaryrefslogtreecommitdiffstats
path: root/share/hooks
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-02-23 15:36:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-02-23 16:30:59 +0000
commit93d59c3176876b0990b27375458cf6518459bb07 (patch)
tree85403b3d9ac7f9df4b91195124b342dee81ec640 /share/hooks
parentReleasing debian version 20180825-3. (diff)
downloadopen-infrastructure-compute-tools-93d59c3176876b0990b27375458cf6518459bb07.tar.xz
open-infrastructure-compute-tools-93d59c3176876b0990b27375458cf6518459bb07.zip
Merging upstream version 20190222.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/hooks')
-rwxr-xr-xshare/hooks/pre-create.git-pull.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/share/hooks/pre-create.git-pull.sh b/share/hooks/pre-create.git-pull.sh
index cee7d8c..a82a7a0 100755
--- a/share/hooks/pre-create.git-pull.sh
+++ b/share/hooks/pre-create.git-pull.sh
@@ -1,7 +1,6 @@
#!/bin/sh
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
#
# SPDX-License-Identifier: GPL-3.0+
#
@@ -20,7 +19,10 @@
set -e
-DIRECTORIES="/etc/container-tools/debconf /etc/container-tools/debconf/*/"
+PROJECT="open-infrastructure"
+PROGRAM="container"
+
+DIRECTORIES="/etc/${PROJECT}/${PROGRAM}/debconf /etc/${PROJECT}/${PROGRAM}/debconf/*/"
for DIRECTORY in ${DIRECTORIES}
do
@@ -28,9 +30,9 @@ do
then
echo "Updating ${DIRECTORY}..."
- if [ -e /etc/default/container-tools ]
+ if [ -e "/etc/${PROJECT}/${PROGRAM}.conf" ]
then
- . /etc/default/container-tools
+ . "/etc/${PROJECT}/${PROGRAM}.conf"
fi
DEBCONF_ID="${DEBCONF_ID:-HEAD}"