Merging upstream version 20220605.

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

6 files changed, 104 insertions, 19 deletions

diff --git a/libexec/container/auto b/libexec/container/auto
index 927eae0..83c5c50 100755
--- a/libexec/container/auto
+++ b/libexec/container/auto
@@ -111,17 +111,50 @@ esac
 
 for FILE in "${CONFIG}"/*.conf
 do
-	if grep -Eqs "^ *cnt.auto=force-true" "${FILE}"
+	if ! grep -Eqs "^ *cnt.container-server=${HOST}" "${FILE}"
 	then
-		OPTIONS="${OPTIONS} -f"
+		continue
 	fi
 
-	if grep -Eqs "^ *cnt.auto=(force-true|true)" "${FILE}" && grep -Eqs "^ *cnt.container-server=${HOST}" "${FILE}"
-	then
-		CONTAINER="$(basename ${FILE} .conf)"
-
-		cnt ${ACTION} -n ${CONTAINER} ${OPTIONS} || true
-	fi
+	CONTAINER="$(basename ${FILE} .conf)"
+	CNT_AUTO="$(grep -Es "^ *cnt.auto=" ${FILE} | awk -F= '{ print $2 }')"
+
+	case "${ACTION}" in
+		start)
+			case "${CNT_AUTO}" in
+				force-true)
+					OPTIONS="${OPTIONS} -f"
+
+					cnt ${ACTION} -n ${CONTAINER} ${OPTIONS} || true
+					;;
+
+				last-on)
+					if grep -qs start "/var/lib/${SOFTWARE}/state/${CONTAINER}.run" || \
+					   [ ! -e "/var/lib/${SOFTWARE}/state/${CONTAINER}.run" ]
+					then
+						cnt start -n ${CONTAINER} ${OPTIONS} -f || true
+					fi
+					;;
+
+				last-off)
+					if grep -qs start "/var/lib/${SOFTWARE}/state/${CONTAINER}.run"
+					then
+						cnt start -n ${CONTAINER} ${OPTIONS} -f || true
+					fi
+					;;
+
+				true)
+					cnt ${ACTION} -n ${CONTAINER} ${OPTIONS} || true
+					;;
+			esac
+			;;
+
+		stop)
+			OPTIONS="${OPTIONS} -f --stateless"
+
+			cnt ${ACTION} -n ${CONTAINER} ${OPTIONS} || true
+			;;
+	esac
 done
 
 # Post hooks
diff --git a/libexec/container/build b/libexec/container/build
index 48f2d4b..2c29730 100755
--- a/libexec/container/build
+++ b/libexec/container/build
@@ -123,7 +123,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--cnt.auto=true|false|force-true] [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [--cnt.overlay-options=OPTION[,OPTION]] [--cnt.start=OPTION[,OPTION]] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--cnt.auto=true|false|force-true|last-on|last-off] [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [--cnt.overlay-options=OPTION[,OPTION]] [--cnt.start=OPTION[,OPTION]] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2
 	echo
 	echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information."
 
diff --git a/libexec/container/key b/libexec/container/key
index 5deff0d..efd214e 100755
--- a/libexec/container/key
+++ b/libexec/container/key
@@ -146,12 +146,12 @@ case "${ACTION}" in
 		if [ -e "${ADD}" ]
 		then
 			gpg --homedir "${KEYS}" --import "${ADD}"
-		elif [ -e "/usr/share/compute-tools/keys/${ADD}" ]
+		elif [ -e "/usr/share/${SOFTWARE}/keys/${ADD}" ]
 		then
-			gpg --homedir "${KEYS}" --import "/usr/share/compute-tools/keys/${ADD}"
-		elif [ -e "/usr/share/compute-tools/keys/${ADD}.pub" ]
+			gpg --homedir "${KEYS}" --import "/usr/share/${SOFTWARE}/keys/${ADD}"
+		elif [ -e "/usr/share/${SOFTWARE}/keys/${ADD}.pub" ]
 		then
-			gpg --homedir "${KEYS}" --import "/usr/share/compute-tools/keys/${ADD}.pub"
+			gpg --homedir "${KEYS}" --import "/usr/share/${SOFTWARE}/keys/${ADD}.pub"
 		else
 			gpg --homedir "${KEYS}" --recv "${ADD}"
 		fi
diff --git a/libexec/container/remove b/libexec/container/remove
index 86f237d..4cb5d48 100755
--- a/libexec/container/remove
+++ b/libexec/container/remove
@@ -150,7 +150,7 @@ case "${STATE}" in
 		case "${ALLOW_STOP}" in
 			true)
 				echo "'${NAME}': container is started, stopping it now" >&2
-				${PROGRAM} stop -n ${NAME}
+				${PROGRAM} stop -n ${NAME} -f
 				;;
 
 			*)
diff --git a/libexec/container/start b/libexec/container/start
index 7b95866..1f22325 100755
--- a/libexec/container/start
+++ b/libexec/container/start
@@ -556,6 +556,9 @@ case "${START}" in
 				;;
 		esac
 
+		mkdir -p "/var/lib/${SOFTWARE}/state"
+		echo "start" > "/var/lib/${SOFTWARE}/state/${NAME}.run"
+
 		${SETARCH} systemd-nspawn --keep-unit ${BIND} ${BIND_RO} ${BOOT} ${CAPABILITY} ${DIRECTORY} ${DROP_CAPABILITY} ${MACHINE} ${NETWORK_VETH_EXTRA} ${LINK_JOURNAL} ${REGISTER}
 
 		case "${VERBOSE}" in
diff --git a/libexec/container/stop b/libexec/container/stop
index cb85c8d..8ca98ce 100755
--- a/libexec/container/stop
+++ b/libexec/container/stop
@@ -34,8 +34,8 @@ Parameters ()
 {
 	OPTIONS_ALL=""
 
-	GETOPT_LONGOPTIONS="name:,force,clean,verbose,"
-	GETOPT_OPTIONS="n:,f,v,"
+	GETOPT_LONGOPTIONS="name:,force,interactive,kill,clean,stateless,verbose,"
+	GETOPT_OPTIONS="n:,f,i,k,v,"
 
 	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
@@ -62,6 +62,20 @@ Parameters ()
 				OPTIONS_ALL="${OPTIONS_ALL} --force"
 				;;
 
+			-i|--interactive)
+				INTERACTIVE="true"
+				shift 1
+
+				OPTIONS_ALL="${OPTIONS_ALL} --interactive"
+				;;
+
+			-k|--kill)
+				KILL="true"
+				shift 1
+
+				OPTIONS_ALL="${OPTIONS_ALL} --kill"
+				;;
+
 			--clean)
 				# internal option
 				CLEAN="true"
@@ -70,6 +84,14 @@ Parameters ()
 				OPTONS_ALL="${OPTIONS_ALL} --clean"
 				;;
 
+			--stateless)
+				# internal option
+				STATELESS="true"
+				shift 1
+
+				OPTIONS_ALL="${OPTIONS_ALL} --stateless"
+				;;
+
 			-v|--verbose)
 				VERBOSE="true"
 				shift 1
@@ -92,7 +114,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--force] [-v|--verbose]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--force] [-i|--interactive] [-v|--verbose]" >&2
 	echo
 	echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information."
 
@@ -263,7 +285,7 @@ case "${STATE}" in
 		;;
 esac
 
-case "${FORCE}" in
+case "${KILL}" in
 	true)
 		MODE="terminate"
 		;;
@@ -273,6 +295,23 @@ case "${FORCE}" in
 		;;
 esac
 
+if [ "${FORCE}" != "true" ] || [ "${INTERACTIVE}" = "true" ]
+then
+	echo -n "'${NAME}': stop container '${NAME}' [y|N]? "
+	read STOP
+
+	STOP="$(echo ${STOP} | tr '[A-Z]' '[a-z]')"
+
+	case "${STOP}" in
+		y|yes)
+			;;
+
+		*)
+			exit 1
+			;;
+	esac
+fi
+
 # Run
 case "${VERBOSE}" in
 	true)
@@ -282,7 +321,7 @@ esac
 
 machinectl ${MODE} ${NAME}
 
-case "${FORCE}" in
+case "${KILL}" in
 	true)
 		VETHS="$(awk -Fnetwork-veth-extra= '/^network-veth-extra=/ { print $2 }' ${CONFIG}/${NAME}.conf | awk -F: '{ print $1 }')"
 
@@ -295,6 +334,16 @@ case "${FORCE}" in
 		;;
 esac
 
+case "${STATELESS}" in
+	true)
+		;;
+
+	*)
+		mkdir -p "/var/lib/${SOFTWARE}/state"
+		echo "stop" > "/var/lib/${SOFTWARE}/state/${NAME}.run"
+		;;
+esac
+
 case "${VERBOSE}" in
 	true)
 		echo " done."