Merging upstream version 20200830.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

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