summaryrefslogtreecommitdiff
path: root/src/systemd
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-21 17:24:57 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-21 17:26:17 +0100
commit65adcc1d80d06e0e76387de0b0c5c9d6c79d8f99 (patch)
tree3ed2b87760b9008ca3082fe85420bc5781c2927e /src/systemd
parent50b2882c663a1c308e9f71f6d0d52109a0170afd (diff)
downloadvyos-1x-65adcc1d80d06e0e76387de0b0c5c9d6c79d8f99.tar.gz
vyos-1x-65adcc1d80d06e0e76387de0b0c5c9d6c79d8f99.zip
console-server: T2490: do not use cli-shell-api in systemd unit
(cherry picked from commit d5804b19d3ffecdd4fe6bd89d50ac84dabb549fd)
Diffstat (limited to 'src/systemd')
-rw-r--r--src/systemd/dropbear@.service5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/systemd/dropbear@.service b/src/systemd/dropbear@.service
index a3fde5708..acf926af9 100644
--- a/src/systemd/dropbear@.service
+++ b/src/systemd/dropbear@.service
@@ -8,9 +8,8 @@ StartLimitIntervalSec=0
[Service]
Type=forking
-ExecStartPre=/usr/bin/bash -c '/usr/bin/systemctl set-environment PORT=$(cli-shell-api returnActiveValue service console-server device "%I" ssh port)'
-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
+ExecStart=/usr/sbin/dropbear -w -j -k -r /etc/dropbear/dropbear_rsa_host_key -P /run/dropbear/dropbear.%I.pid -p %I
+PIDFile=/run/dropbear/dropbear.%I.pid
KillMode=process
Restart=always
RestartSec=10