summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-01-23 12:59:19 +0100
committerChristian Poessinger <christian@poessinger.com>2021-01-23 13:00:31 +0100
commit75e2ef3439c6de38cdb0dc9eb84d0657b5cb6d1c (patch)
treed64f45f0637cf74428b61a0bc2b7eba63a512dca
parent91f5b0dd47615c8ff6c405af5c5ffffb800a7df9 (diff)
downloadvyos-1x-75e2ef3439c6de38cdb0dc9eb84d0657b5cb6d1c.tar.gz
vyos-1x-75e2ef3439c6de38cdb0dc9eb84d0657b5cb6d1c.zip
console-server: T2490: dropbear can restart as long as necessary
Lift the default daemon startup rate-limit when launching the dropbear service used by SSH connections to the console port. (cherry picked from commit ed622e21c28446e5c4c4e24551627dd940aca8bf)
-rw-r--r--src/systemd/dropbear@.service5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/systemd/dropbear@.service b/src/systemd/dropbear@.service
index 606a7ea6d..a3fde5708 100644
--- a/src/systemd/dropbear@.service
+++ b/src/systemd/dropbear@.service
@@ -4,6 +4,7 @@ Requires=dropbearkey.service
Wants=conserver-server.service
ConditionPathExists=/run/conserver/conserver.cf
After=dropbearkey.service vyos-router.service conserver-server.service
+StartLimitIntervalSec=0
[Service]
Type=forking
@@ -11,4 +12,6 @@ ExecStartPre=/usr/bin/bash -c '/usr/bin/systemctl set-environment PORT=$(cli-she
ExecStart=-/usr/sbin/dropbear -w -j -k -r /etc/dropbear/dropbear_rsa_host_key -c "/usr/bin/console %I" -P /run/conserver/dropbear.%I.pid -p ${PORT}
PIDFile=/run/conserver/dropbear.%I.pid
KillMode=process
-Restart=on-failure
+Restart=always
+RestartSec=10
+RuntimeDirectoryPreserve=yes