6 files changed, 53 insertions, 64 deletions
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index fdc8d2443..ce0e01308 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -19,11 +19,11 @@ import os
 from sys import exit
 
 from vyos.config import Config
-from vyos import ConfigError
-from vyos.util import call
 from vyos.template import render
+from vyos.util import call
+from vyos import ConfigError
 
-config_file = r'/etc/default/isc-dhcp-relay'
+config_file = r'/run/dhcp-relay/dhcp.conf'
 
 default_config_data = {
     'interface': [],
@@ -95,19 +95,25 @@ def verify(relay):
 
 def generate(relay):
     # bail out early - looks like removal from running config
-    if relay is None:
+    if not relay:
         return None
 
+    # Create configuration directory on demand
+    dirname = os.path.dirname(config_file)
+    if not os.path.isdir(dirname):
+        os.mkdir(dirname)
+
     render(config_file, 'dhcp-relay/config.tmpl', relay)
     return None
 
 def apply(relay):
-    if relay is not None:
-        call('sudo systemctl restart isc-dhcp-relay.service')
+    if relay:
+        call('systemctl restart isc-dhcp-relay.service')
     else:
         # DHCP relay support is removed in the commit
-        call('sudo systemctl stop isc-dhcp-relay.service')
-        os.unlink(config_file)
+        call('systemctl stop isc-dhcp-relay.service')
+        if os.path.exists(config_file):
+            os.unlink(config_file)
 
     return None
 
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py
index 6544db055..cb5a4bbfb 100755
--- a/src/conf_mode/dhcpv6_relay.py
+++ b/src/conf_mode/dhcpv6_relay.py
@@ -24,8 +24,7 @@ from vyos import ConfigError
 from vyos.util import call
 from vyos.template import render
 
-
-config_file = r'/etc/default/isc-dhcpv6-relay'
+config_file = r'/run/dhcp-relay/dhcpv6.conf'
 
 default_config_data = {
     'listen_addr': [],
@@ -85,16 +84,22 @@ def generate(relay):
     if relay is None:
         return None
 
+    # Create configuration directory on demand
+    dirname = os.path.dirname(config_file)
+    if not os.path.isdir(dirname):
+        os.mkdir(dirname)
+
     render(config_file, 'dhcpv6-relay/config.tmpl', relay)
     return None
 
 def apply(relay):
     if relay is not None:
-        call('sudo systemctl restart isc-dhcpv6-relay.service')
+        call('systemctl restart isc-dhcp-relay6.service')
     else:
         # DHCPv6 relay support is removed in the commit
-        call('sudo systemctl stop isc-dhcpv6-relay.service')
-        os.unlink(config_file)
+        call('systemctl stop isc-dhcp-relay6.service')
+        if os.path.exists(config_file):
+            os.unlink(config_file)
 
     return None
 
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 10aec3dcd..498c24df0 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -609,7 +609,7 @@ def generate(wifi):
 
     # Delete config files if interface is removed
     if wifi['deleted']:
-        if os.path.isfile(get_conf_file('hostapd', )):
+        if os.path.isfile(get_conf_file('hostapd', interface)):
             os.unlink(get_conf_file('hostapd', interface))
 
         if os.path.isfile(get_conf_file('wpa_supplicant', interface)):
diff --git a/src/etc/init.d/isc-dhcpv6-relay b/src/etc/init.d/isc-dhcpv6-relay
deleted file mode 100755
index e553eafd1..000000000
--- a/src/etc/init.d/isc-dhcpv6-relay
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-#
-
-### BEGIN INIT INFO
-# Provides:          isc-dhcpv6-relay
-# Required-Start:    $remote_fs $network
-# Required-Stop:     $remote_fs $network
-# Should-Start:      $local_fs
-# Should-Stop:       $local_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: IPv6 DHCP relay
-# Description:       Dynamic Host Configuration Protocol Relay for IPv6
-### END INIT INFO
-
-# It is not safe to start if we don't have a default configuration...
-if [ ! -f /etc/default/isc-dhcpv6-relay ]; then
-	echo "/etc/default/isc-dhcpv6-relay does not exist! - Aborting..."
-	exit 1
-fi
-
-# Source init functions
-. /lib/lsb/init-functions
-
-# Read init script configuration (interfaces the daemon should listen on
-# and the DHCP server we should forward requests to.)
-[ -f /etc/default/isc-dhcpv6-relay ] && . /etc/default/isc-dhcpv6-relay
-
-DHCRELAYPID=/var/run/dhcv6relay.pid
-
-case "$1" in
-	start)
-		start-stop-daemon --start --oknodo --quiet --pidfile $DHCRELAYPID \
-			--exec /usr/sbin/dhcrelay -- -q $OPTIONS -pf $DHCRELAYPID
-		;;
-	stop)
-		start-stop-daemon --stop --oknodo --quiet --pidfile $DHCRELAYPID
-		;;
-	restart | force-reload)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-	*)
-		echo "Usage: /etc/init.d/isc-dhcpv6-relay {start|stop|restart|force-reload}"
-		exit 1
-esac
-
-exit 0
diff --git a/src/systemd/isc-dhcp-relay.service b/src/systemd/isc-dhcp-relay.service
new file mode 100644
index 000000000..ebf4d234e
--- /dev/null
+++ b/src/systemd/isc-dhcp-relay.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=ISC DHCP IPv4 relay
+Documentation=man:dhcrelay(8)
+Wants=network-online.target
+ConditionPathExists=/run/dhcp-relay/dhcp.conf
+After=vyos-router.service
+
+[Service]
+WorkingDirectory=/run/dhcp-relay
+EnvironmentFile=/run/dhcp-relay/dhcp.conf
+ExecStart=/usr/sbin/dhcrelay -d -4 $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/systemd/isc-dhcp-relay6.service b/src/systemd/isc-dhcp-relay6.service
new file mode 100644
index 000000000..a477618b1
--- /dev/null
+++ b/src/systemd/isc-dhcp-relay6.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=ISC DHCP IPv6 relay
+Documentation=man:dhcrelay(8)
+Wants=network-online.target
+ConditionPathExists=/run/dhcp-relay/dhcpv6.conf
+After=vyos-router.service
+
+[Service]
+WorkingDirectory=/run/dhcp-relay
+EnvironmentFile=/run/dhcp-relay/dhcpv6.conf
+ExecStart=/usr/sbin/dhcrelay -d -6 $OPTIONS
+
+[Install]
+WantedBy=multi-user.target