From 87ca698bdbb0a423ac6adf7a2c9fabb1263c7520 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Nov 2021 07:54:58 +0100 Subject: Replacing individual needrestart overrides by globally blacklisting container-tools service units. Signed-off-by: Daniel Baumann --- libexec/container/start | 4 ---- libexec/container/stop | 3 --- 2 files changed, 7 deletions(-) (limited to 'libexec') 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 -- cgit v1.2.3