diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-11-03 10:03:38 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-11-03 10:03:47 +0000 |
commit | 9447007f57ff245014ac03a040a5f572db20c2ea (patch) | |
tree | 39d76382ed39876ae6462c1e18f734a7811b8136 /libexec | |
parent | Releasing debian version 20211102-1. (diff) | |
download | open-infrastructure-compute-tools-9447007f57ff245014ac03a040a5f572db20c2ea.tar.xz open-infrastructure-compute-tools-9447007f57ff245014ac03a040a5f572db20c2ea.zip |
Merging upstream version 20211103.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | libexec/container/start | 4 | ||||
-rwxr-xr-x | libexec/container/stop | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libexec/container/start b/libexec/container/start index f899446..32d385e 100755 --- a/libexec/container/start +++ b/libexec/container/start @@ -27,6 +27,7 @@ COMMAND="$(basename ${0})" CONFIG="/etc/${SOFTWARE}/config" HOOKS="/etc/${SOFTWARE}/hooks" MACHINES="/var/lib/machines" +NEEDRESTART="/usr/share/${SOFTWARE}/needrestart" START="false" SYSTEMCTL="true" @@ -530,6 +531,9 @@ case "${START}" in ;; esac + mkdir -p /etc/needrestart/restart.d + ln -sf "${NEEDRESTART}"/container@.service "/etc/needrestart/restart.d/container@${NAME}.service" + ${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 98b2afa..9130c97 100755 --- a/libexec/container/stop +++ b/libexec/container/stop @@ -27,6 +27,7 @@ COMMAND="$(basename ${0})" CONFIG="/etc/${SOFTWARE}/config" HOOKS="/etc/${SOFTWARE}/hooks" MACHINES="/var/lib/machines" +NEEDRESTART="/usr/share/${SOFTWARE}/needrestart" CLEAN="false" @@ -264,6 +265,8 @@ case "${VERBOSE}" in ;; esac +rm -f "/etc/needrestart/restart.d/container@${NAME}.service" + machinectl ${MODE} ${NAME} case "${FORCE}" in |