summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-28 20:05:20 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-28 20:15:37 +0200
commit3e7b8515cafb6f6e015c765021ecd38203d87a4d (patch)
tree2a8546caae39d854ae02504c5d594ebaf0111618 /src
parentc5b7ea987a2e209bc553a89c340d0a208f926c71 (diff)
downloadvyos-1x-3e7b8515cafb6f6e015c765021ecd38203d87a4d.tar.gz
vyos-1x-3e7b8515cafb6f6e015c765021ecd38203d87a4d.zip
dhclient6: T2393: T2394: migrate from SysVinit to systemd
Diffstat (limited to 'src')
-rw-r--r--src/systemd/dhclient6@.service18
-rw-r--r--src/systemd/dhclient@.service4
2 files changed, 20 insertions, 2 deletions
diff --git a/src/systemd/dhclient6@.service b/src/systemd/dhclient6@.service
new file mode 100644
index 000000000..d871e7354
--- /dev/null
+++ b/src/systemd/dhclient6@.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=DHCPv6 client on %i
+Documentation=man:dhclient(8)
+RequiresMountsFor=/run
+ConditionPathExists=/run/dhclient6/%i.conf
+ConditionPathExists=/run/dhclient6/%i.options
+After=vyos-router.service
+
+[Service]
+WorkingDirectory=/run/dhclient6
+Type=exec
+EnvironmentFile=-/run/dhclient6/%i.options
+PIDFile=/run/dhclient6/%i.pid
+ExecStart=/sbin/dhclient -6 $DHCLIENT_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/systemd/dhclient@.service b/src/systemd/dhclient@.service
index 5e185908b..c6f1e4be1 100644
--- a/src/systemd/dhclient@.service
+++ b/src/systemd/dhclient@.service
@@ -1,5 +1,5 @@
[Unit]
-Description=DHCP client on %i (IPv4)
+Description=DHCP client on %i
Documentation=man:dhclient(8)
RequiresMountsFor=/run
ConditionPathExists=/run/dhclient/%i.conf
@@ -8,7 +8,7 @@ After=vyos-router.service
[Service]
WorkingDirectory=/run/dhclient
-Type=simple
+Type=forking
EnvironmentFile=-/run/dhclient/%i.options
PIDFile=/run/dhclient/%i.pid
ExecStart=/sbin/dhclient -4 $DHCLIENT_OPTS