summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-03-11 23:09:38 +0100
committerChristian Breunig <christian@breunig.cc>2023-03-11 23:10:44 +0100
commitf2f086567a3dea3717219e776a464a3a59ccc085 (patch)
tree347a2d20f94e783712c10e47e4fab0f348cf9f20
parent9ed4113d6c4809a0126d04c99d60eaa76a7b6b15 (diff)
downloadvyos-1x-f2f086567a3dea3717219e776a464a3a59ccc085.tar.gz
vyos-1x-f2f086567a3dea3717219e776a464a3a59ccc085.zip
keepalived: T5003: remove Debian default config path from ConditionFileNotEmpty
Also ExecReload is a duplicate of the base service file
-rw-r--r--src/etc/systemd/system/keepalived.service.d/override.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/etc/systemd/system/keepalived.service.d/override.conf b/src/etc/systemd/system/keepalived.service.d/override.conf
index 923e1d280..d91a824b9 100644
--- a/src/etc/systemd/system/keepalived.service.d/override.conf
+++ b/src/etc/systemd/system/keepalived.service.d/override.conf
@@ -1,6 +1,8 @@
[Unit]
After=vyos-router.service
-# Only start if there is a configuration file
+# Only start if there is our configuration file - remove Debian default
+# config file from the condition list
+ConditionFileNotEmpty=
ConditionFileNotEmpty=/run/keepalived/keepalived.conf
[Service]
@@ -9,5 +11,4 @@ Type=simple
# Read configuration variable file if it is present
ExecStart=
ExecStart=/usr/sbin/keepalived --use-file /run/keepalived/keepalived.conf --pid /run/keepalived/keepalived.pid --dont-fork --snmp
-ExecReload=/bin/kill -HUP $MAINPID
PIDFile=/run/keepalived/keepalived.pid