summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-01-03 18:43:35 +0100
committerChristian Poessinger <christian@poessinger.com>2022-01-09 20:55:35 +0100
commit1bb6b4458aa639e7dbea9fc9d6f666bdc7ea9612 (patch)
tree1418d39b21d7f1eb44465cf209b362906fd29d34
parent5b9edbc220dec7aefd79a39da3f8f6ab6f34007c (diff)
downloadvyos-1x-1bb6b4458aa639e7dbea9fc9d6f666bdc7ea9612.tar.gz
vyos-1x-1bb6b4458aa639e7dbea9fc9d6f666bdc7ea9612.zip
keepalived: T4128: add systemd option Type=simple
Without this option systemd startup will hit a timeout and the kill keepalived again. (cherry picked from commit 2a279f48e208b90c91eac5d6c5855e65cee39018)
-rw-r--r--src/etc/systemd/system/keepalived.service.d/override.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/etc/systemd/system/keepalived.service.d/override.conf b/src/etc/systemd/system/keepalived.service.d/override.conf
index c18ae0c29..1346962a4 100644
--- a/src/etc/systemd/system/keepalived.service.d/override.conf
+++ b/src/etc/systemd/system/keepalived.service.d/override.conf
@@ -6,6 +6,8 @@ After=vyos-router.service
[Service]
KillMode=process
+Type=simple
+EnvironmentFile=
ExecStart=
ExecStart=/usr/sbin/keepalived --use-file /run/keepalived/keepalived.conf --pid /run/keepalived/keepalived.pid --dont-fork --snmp
PIDFile=