summaryrefslogtreecommitdiffstats
path: root/lib/container
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-08-30 13:47:28 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-08-30 13:48:46 +0000
commit9ca54078e1376fa81b5ca70125c795bc7dbf3a11 (patch)
tree44eeee22d9d64b2f670c33b845f6bf20d257d5ff /lib/container
parentReleasing debian version 20200121-1. (diff)
downloadopen-infrastructure-compute-tools-9ca54078e1376fa81b5ca70125c795bc7dbf3a11.tar.xz
open-infrastructure-compute-tools-9ca54078e1376fa81b5ca70125c795bc7dbf3a11.zip
Merging upstream version 20200830.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container')
-rwxr-xr-xlib/container/move2
-rwxr-xr-xlib/container/remove2
-rwxr-xr-xlib/container/start18
-rwxr-xr-xlib/container/version1
4 files changed, 12 insertions, 11 deletions
diff --git a/lib/container/move b/lib/container/move
index cdabbe4..377bd7c 100755
--- a/lib/container/move
+++ b/lib/container/move
@@ -117,7 +117,7 @@ case "${FORCE}" in
echo -n "'${OLD}': rename container to '${NEW}' [y|N]? "
read FORCE
- FORCE="$(echo ${FORCE} | tr [A-Z] [a-z])"
+ FORCE="$(echo ${FORCE} | tr '[A-Z]' '[a-z]')"
case "${FORCE}" in
y|yes)
diff --git a/lib/container/remove b/lib/container/remove
index 404b80d..208de3d 100755
--- a/lib/container/remove
+++ b/lib/container/remove
@@ -171,7 +171,7 @@ case "${FORCE}" in
echo -n "'${NAME}': remove container '${NAME}' [y|N]? "
read FORCE
- FORCE="$(echo ${FORCE} | tr [A-Z] [a-z])"
+ FORCE="$(echo ${FORCE} | tr '[A-Z]' '[a-z]')"
case "${FORCE}" in
y|yes)
diff --git a/lib/container/start b/lib/container/start
index f89944d..5938193 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -482,6 +482,15 @@ case "${SYSTEMCTL}" in
true)
systemctl start ${PROGRAM}@${NAME}.service
+ # Post hooks
+ for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}"
+ do
+ if [ -x "${FILE}" ]
+ then
+ "${FILE}"
+ fi
+ done
+
exit 0
;;
esac
@@ -498,14 +507,5 @@ case "${START}" in
*)
# Run
${SETARCH} systemd-nspawn --keep-unit ${BIND} ${BIND_RO} ${BOOT} ${CAPABILITY} ${DIRECTORY} ${DROP_CAPABILITY} ${MACHINE} ${NETWORK_VETH_EXTRA} ${LINK_JOURNAL} ${REGISTER}
-
- # Post hooks
- for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}"
- do
- if [ -x "${FILE}" ]
- then
- "${FILE}"
- fi
- done
;;
esac
diff --git a/lib/container/version b/lib/container/version
index 8efc91c..8d7f052 100755
--- a/lib/container/version
+++ b/lib/container/version
@@ -35,6 +35,7 @@ do
fi
done
+# Run
cat "${SHARE}/VERSION.txt"
# Post hooks