summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-11-03 09:54:53 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-11-03 09:54:53 +0000
commit814c84844bb14b3cf413ee10ad8c9f7aebf41a7c (patch)
tree5fe8715c0b5dce8bbf6596be2a4394bee80a1d3b
parentAdding needrestart restart scripts. (diff)
downloadcompute-tools-814c84844bb14b3cf413ee10ad8c9f7aebf41a7c.tar.xz
compute-tools-814c84844bb14b3cf413ee10ad8c9f7aebf41a7c.zip
Enabling automatic needrestart blacklisting for containers.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xlibexec/container/start4
-rwxr-xr-xlibexec/container/stop3
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