7 files changed, 16 insertions, 18 deletions
diff --git a/src/op_mode/dns_forwarding_restart.sh b/src/op_mode/dns_forwarding_restart.sh
index 8e556f2f0..64cc92115 100755
--- a/src/op_mode/dns_forwarding_restart.sh
+++ b/src/op_mode/dns_forwarding_restart.sh
@@ -2,7 +2,7 @@
 
 if cli-shell-api existsEffective service dns forwarding; then
     echo "Restarting the DNS forwarding service"
-    systemctl restart pdns-recursor
+    systemctl restart pdns-recursor.service
 else
     echo "DNS forwarding is not configured"
 fi
diff --git a/src/op_mode/dynamic_dns.py b/src/op_mode/dynamic_dns.py
index 405dd9f04..e4e5043d5 100755
--- a/src/op_mode/dynamic_dns.py
+++ b/src/op_mode/dynamic_dns.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-2020 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -23,8 +23,7 @@ import time
 from vyos.config import Config
 from vyos.util import call
 
-
-cache_file = r'/var/cache/ddclient/ddclient.cache'
+cache_file = r'/run/ddclient/ddclient.cache'
 
 OUT_TMPL_SRC = """
 {%- for entry in hosts -%}
@@ -86,9 +85,9 @@ def show_status():
 
 
 def update_ddns():
-    call('systemctl stop ddclient')
+    call('systemctl stop ddclient.service')
     os.remove(cache_file)
-    call('systemctl start ddclient')
+    call('systemctl start ddclient.service')
 
 
 def main():
diff --git a/src/op_mode/flow_accounting_op.py b/src/op_mode/flow_accounting_op.py
index 71fdfc288..bf8c39fd6 100755
--- a/src/op_mode/flow_accounting_op.py
+++ b/src/op_mode/flow_accounting_op.py
@@ -70,7 +70,7 @@ def _is_host(host):
 
 # check if flow-accounting running
 def _uacctd_running():
-    command = '/usr/bin/sudo /bin/systemctl status uacctd > /dev/null'
+    command = 'systemctl status uacctd.service > /dev/null'
     return run(command) == 0
 
 # get list of interfaces
@@ -195,7 +195,7 @@ if not _uacctd_running():
 # restart pmacct daemon
 if cmd_args.action == 'restart':
     # run command to restart flow-accounting
-    cmd('/usr/bin/sudo /bin/systemctl restart uacctd',
+    cmd('systemctl restart uacctd.service',
         message='Failed to restart flow-accounting')
 
 # clear in-memory collected flows
diff --git a/src/op_mode/generate_ssh_server_key.py b/src/op_mode/generate_ssh_server_key.py
index f65d383c0..cbc9ef973 100755
--- a/src/op_mode/generate_ssh_server_key.py
+++ b/src/op_mode/generate_ssh_server_key.py
@@ -14,14 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
-
+from sys import exit
 from vyos.util import ask_yes_no
 from vyos.util import cmd
 
 if not ask_yes_no('Do you really want to remove the existing SSH host keys?'):
-    sys.exit(0)
+    exit(0)
 
-cmd('sudo rm -v /etc/ssh/ssh_host_*')
-cmd('sudo dpkg-reconfigure openssh-server')
-cmd('sudo systemctl restart ssh')
+cmd('rm -v /etc/ssh/ssh_host_*')
+cmd('dpkg-reconfigure openssh-server')
+cmd('systemctl restart ssh.service')
diff --git a/src/op_mode/restart_dhcp_relay.py b/src/op_mode/restart_dhcp_relay.py
index 66dc435b3..af4fb2d15 100755
--- a/src/op_mode/restart_dhcp_relay.py
+++ b/src/op_mode/restart_dhcp_relay.py
@@ -39,7 +39,7 @@ if __name__ == '__main__':
         if not c.exists_effective('service dhcp-relay'):
             print("DHCP relay service not configured")
         else:
-            call('sudo systemctl restart isc-dhcp-relay.service')
+            call('systemctl restart isc-dhcp-server.service')
 
         sys.exit(0)
     elif args.ipv6:
@@ -47,7 +47,7 @@ if __name__ == '__main__':
         if not c.exists_effective('service dhcpv6-relay'):
             print("DHCPv6 relay service not configured")
         else:
-            call('sudo systemctl restart isc-dhcpv6-relay.service')
+            call('systemctl restart isc-dhcp-server6.service')
 
         sys.exit(0)
     else:
diff --git a/src/op_mode/show_dhcp.py b/src/op_mode/show_dhcp.py
index a79033f69..c49e604b7 100755
--- a/src/op_mode/show_dhcp.py
+++ b/src/op_mode/show_dhcp.py
@@ -193,7 +193,7 @@ if __name__ == '__main__':
         sys.exit(0)
 
     # if dhcp server is down, inactive leases may still be shown as active, so warn the user.
-    if call('systemctl -q is-active isc-dhcpv4-server.service') != 0:
+    if call('systemctl -q is-active isc-dhcp-server.service') != 0:
         print("WARNING: DHCP server is configured but not started. Data may be stale.")
 
     if args.leases:
diff --git a/src/op_mode/show_dhcpv6.py b/src/op_mode/show_dhcpv6.py
index 18baa5517..d686defc0 100755
--- a/src/op_mode/show_dhcpv6.py
+++ b/src/op_mode/show_dhcpv6.py
@@ -179,7 +179,7 @@ if __name__ == '__main__':
         sys.exit(0)
 
     # if dhcp server is down, inactive leases may still be shown as active, so warn the user.
-    if call('systemctl -q is-active isc-dhcpv6-server.service') != 0:
+    if call('systemctl -q is-active isc-dhcp-server6.service') != 0:
         print("WARNING: DHCPv6 server is configured but not started. Data may be stale.")
 
     if args.leases: