summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-01-18 17:50:55 +0100
committerChristian Poessinger <christian@poessinger.com>2021-01-18 17:53:19 +0100
commitc71bf9ca97a04d578eb1f600fb7435b001fd17cd (patch)
treecba515dc7ff7806945cd96cf2829d6192cc33663
parent36c9e15a60a4f99e6881702d6142711fa535f77d (diff)
downloadvyos-1x-c71bf9ca97a04d578eb1f600fb7435b001fd17cd.tar.gz
vyos-1x-c71bf9ca97a04d578eb1f600fb7435b001fd17cd.zip
ssh: T3212: remove RestartPreventExitStatus from systemd unit
When configuring SSH to only run inside a given VRF the system can not start SSHd on bootup as the Kernel will report EPERM (Operation not permitted) when loading the VRF BPF program. This returns the exit code 255 which is marked in the systemd unit file to stop restarting the service forever. Removing this limitation will restart the SSHd on startup and it will live inside the VRF till the end of days. (cherry picked from commit cdbac8f10b470a06aff54832da7f006aa3ed194e)
-rw-r--r--data/templates/ssh/override.conf.tmpl1
1 files changed, 1 insertions, 0 deletions
diff --git a/data/templates/ssh/override.conf.tmpl b/data/templates/ssh/override.conf.tmpl
index 0abde6248..5f8f35e89 100644
--- a/data/templates/ssh/override.conf.tmpl
+++ b/data/templates/ssh/override.conf.tmpl
@@ -8,5 +8,6 @@ ConditionPathExists={{config_file}}
ExecStart=
ExecStart={{vrf_command}}/usr/sbin/sshd -f {{config_file}} -D $SSHD_OPTS
Restart=always
+RestartPreventExitStatus=
RestartSec=10
RuntimeDirectoryPreserve=yes