diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-07-27 00:58:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-07-27 00:59:00 +0000 |
| commit | 71ec84349d0f21c605d16f5334e58b31b0eeee8e (patch) | |
| tree | ec9ad23b5013dba8f4d2222d368e69830f281c5c /share/hooks | |
| parent | Releasing debian version 20210726-1. (diff) | |
| download | open-infrastructure-compute-tools-71ec84349d0f21c605d16f5334e58b31b0eeee8e.tar.xz open-infrastructure-compute-tools-71ec84349d0f21c605d16f5334e58b31b0eeee8e.zip | |
Merging upstream version 20210727.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/hooks')
| -rwxr-xr-x | share/hooks/post-start.chown-nvidia.sh | 4 | ||||
| -rwxr-xr-x | share/hooks/pre-build.git-pull.sh | 11 | ||||
| -rwxr-xr-x | share/hooks/pre-get.git-pull.sh | 11 |
3 files changed, 18 insertions, 8 deletions
diff --git a/share/hooks/post-start.chown-nvidia.sh b/share/hooks/post-start.chown-nvidia.sh index 64c02cc..2a99bd3 100755 --- a/share/hooks/post-start.chown-nvidia.sh +++ b/share/hooks/post-start.chown-nvidia.sh @@ -19,6 +19,10 @@ set -e +PROJECT="open-infrastructure" +SOFTWARE="compute-tools" +PROGRAM="container" + CONTAINER="/var/lib/machines" if grep -qs nvidia "${CONTAINER}/${NAME}/etc/group" 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}" diff --git a/share/hooks/pre-get.git-pull.sh b/share/hooks/pre-get.git-pull.sh index 744f955..d2cc152 100755 --- a/share/hooks/pre-get.git-pull.sh +++ b/share/hooks/pre-get.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}" |