summaryrefslogtreecommitdiffstats
path: root/share/hooks
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-04-11 12:16:14 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-04-11 12:45:14 +0000
commitec8255b378751dca48bc839e8751cea5bd339921 (patch)
tree2af70efd08b300b299d6f157c6919c329a7513c6 /share/hooks
parentMoving command files from /usr/lib to /usr/libexec. (diff)
downloadcompute-tools-ec8255b378751dca48bc839e8751cea5bd339921.tar.xz
compute-tools-ec8255b378751dca48bc839e8751cea5bd339921.zip
Moving config files from /etc/open-infrastructure to /etc/compute-tools.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'share/hooks')
-rwxr-xr-xshare/hooks/pre-create.git-pull.sh7
-rwxr-xr-xshare/hooks/pre-start.unlink-console.sh3
2 files changed, 6 insertions, 4 deletions
diff --git a/share/hooks/pre-create.git-pull.sh b/share/hooks/pre-create.git-pull.sh
index 823440f..9704206 100755
--- a/share/hooks/pre-create.git-pull.sh
+++ b/share/hooks/pre-create.git-pull.sh
@@ -20,9 +20,10 @@
set -e
PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
PROGRAM="container"
-DIRECTORIES="/etc/${PROJECT}/${PROGRAM}/debconf /etc/${PROJECT}/${PROGRAM}/debconf/*/"
+DIRECTORIES="/etc/${SOFTWARE}/debconf /etc/${SOFTWARE}/debconf/*/"
for DIRECTORY in ${DIRECTORIES}
do
@@ -30,9 +31,9 @@ do
then
echo "Updating ${DIRECTORY}..."
- if [ -e "/etc/${PROJECT}/${PROGRAM}.conf" ]
+ if [ -e "/etc/${SOFTWARE}.conf" ]
then
- . "/etc/${PROJECT}/${PROGRAM}.conf"
+ . "/etc/${SOFTWARE}.conf"
fi
DEBCONF_ID="${DEBCONF_ID:-HEAD}"
diff --git a/share/hooks/pre-start.unlink-console.sh b/share/hooks/pre-start.unlink-console.sh
index 3133a19..f781167 100755
--- a/share/hooks/pre-start.unlink-console.sh
+++ b/share/hooks/pre-start.unlink-console.sh
@@ -20,9 +20,10 @@
set -e
PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
PROGRAM="container"
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+CONFIG="/etc/${SOFTWARE}/config"
# Run
if grep -qs 'bind=.*/dev:/dev;' "${CONFIG}/${NAME}.conf"