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