summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-18 23:09:58 +0200
committerChristian Poessinger <christian@poessinger.com>2020-06-18 23:09:58 +0200
commitb509bbf0c0bf33f39e67f0aa8df481ef15d6bae9 (patch)
tree0aec1b3bed8f4f38d187617efb525d40f64f59ff /src
parente59da2923cbbb21258cc9769b6a152d6af78abe6 (diff)
downloadvyos-1x-b509bbf0c0bf33f39e67f0aa8df481ef15d6bae9.tar.gz
vyos-1x-b509bbf0c0bf33f39e67f0aa8df481ef15d6bae9.zip
console-server: T2490: rename CLI to console-server
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/service_console-server.py (renamed from src/conf_mode/service_serial-proxy.py)2
-rw-r--r--src/systemd/dropbear@.service2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/service_serial-proxy.py b/src/conf_mode/service_console-server.py
index 5f510d311..087b13c04 100755
--- a/src/conf_mode/service_serial-proxy.py
+++ b/src/conf_mode/service_console-server.py
@@ -35,7 +35,7 @@ default_values = {
def get_config():
conf = Config()
- base = ['service', 'serial-proxy']
+ base = ['service', 'console-server']
if not conf.exists(base):
return None
diff --git a/src/systemd/dropbear@.service b/src/systemd/dropbear@.service
index a4df6ad41..a7057ffe1 100644
--- a/src/systemd/dropbear@.service
+++ b/src/systemd/dropbear@.service
@@ -7,7 +7,7 @@ After=dropbearkey.service vyos-router.service conserver-server.service
[Service]
Type=forking
-ExecStartPre=/usr/bin/bash -c '/usr/bin/systemctl set-environment PORT=$(cli-shell-api returnValue service serial-proxy device "%I" ssh port)'
+ExecStartPre=/usr/bin/bash -c '/usr/bin/systemctl set-environment PORT=$(cli-shell-api returnValue 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
KillMode=process