From 0cbad2850451af896c997774cbd63812cdaf9f37 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 12 Apr 2020 22:31:52 +0200 Subject: dhcpv6-server: T2185: migrate from SysVinit to systemd --- src/systemd/isc-dhcp-server.service | 3 +-- src/systemd/isc-dhcp-server6.service | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 src/systemd/isc-dhcp-server6.service (limited to 'src/systemd') diff --git a/src/systemd/isc-dhcp-server.service b/src/systemd/isc-dhcp-server.service index 4c3cb9920..d848e3df1 100644 --- a/src/systemd/isc-dhcp-server.service +++ b/src/systemd/isc-dhcp-server.service @@ -1,10 +1,9 @@ [Unit] Description=ISC DHCP IPv4 server Documentation=man:dhcpd(8) -After=vyos-router.service RequiresMountsFor=/run -After=time-sync.target ConditionPathExists=/run/dhcp-server/dhcpd.conf +After=vyos-router.service [Service] WorkingDirectory=/run/dhcp-server diff --git a/src/systemd/isc-dhcp-server6.service b/src/systemd/isc-dhcp-server6.service new file mode 100644 index 000000000..743f16840 --- /dev/null +++ b/src/systemd/isc-dhcp-server6.service @@ -0,0 +1,18 @@ +[Unit] +Description=ISC DHCP IPv6 server +Documentation=man:dhcpd(8) +RequiresMountsFor=/run +ConditionPathExists=/run/dhcp-server/dhcpd.conf +After=vyos-router.service + +[Service] +WorkingDirectory=/run/dhcp-server +# The leases files need to be root:vyattacfg even when dropping privileges +ExecStart=/bin/sh -ec '\ + [ -e /config/dhcpdv6.leases ] || touch /config/dhcpdv6.leases; \ + chown root:vyattacfg /config/dhcpdv6.leases; \ + chmod 664 /config/dhcpdv6.leases; \ + exec /usr/sbin/dhcpd -user nobody -group nogroup -f -6 -pf /run/dhcp-server/dhcpdv6.pid -cf /run/dhcp-server/dhcpdv6.conf -lf /config/dhcpdv6.leases' + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3