summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Groocock <me@frebib.net>2023-05-14 12:50:33 +0100
committerJoe Groocock <me@frebib.net>2023-05-14 11:50:33 +0000
commit85b7b4fea9a5e9fdcfe138ec1f1816594fee70ea (patch)
tree37d0ecbced4ea2e52781af85542b3fcb7ed79b45
parent151f851502c8f7ec09d411a8a81452f7a7d64042 (diff)
downloadvyos-1x-85b7b4fea9a5e9fdcfe138ec1f1816594fee70ea.tar.gz
vyos-1x-85b7b4fea9a5e9fdcfe138ec1f1816594fee70ea.zip
T5224: Stop syslog.socket alongside syslog.service
Avoids the following warning, and any external service from re-activating syslog via systemd socket activation: frebib@vyos# commit [ system syslog ] DEBUG/COMMAND returned (err): Warning: Stopping syslog.service, but it can still be activated by: syslog.socket DEBUG/COMMAND cmd 'systemctl stop syslog.service' Signed-off-by: Joe Groocock <me@frebib.net>
-rwxr-xr-xsrc/conf_mode/system-syslog.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/conf_mode/system-syslog.py b/src/conf_mode/system-syslog.py
index 4995ccb40..cf34bad2e 100755
--- a/src/conf_mode/system-syslog.py
+++ b/src/conf_mode/system-syslog.py
@@ -126,9 +126,10 @@ def generate(syslog):
return None
def apply(syslog):
+ systemd_socket = 'syslog.socket'
systemd_service = 'syslog.service'
if not syslog:
- call(f'systemctl stop {systemd_service}')
+ call(f'systemctl stop {systemd_service} {systemd_socket}')
return None
# we need to restart the service if e.g. the VRF name changed