From af87333fe4164c9d37f8d21d50dd4e164378c709 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 29 Apr 2020 15:06:05 +0200
Subject: dhclient: T2393: switch to old configuration path to keep existing
 op-mode tolls intact

---
 src/systemd/dhclient6@.service | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/systemd/dhclient6@.service')

diff --git a/src/systemd/dhclient6@.service b/src/systemd/dhclient6@.service
index d871e7354..fd69e4d48 100644
--- a/src/systemd/dhclient6@.service
+++ b/src/systemd/dhclient6@.service
@@ -1,17 +1,17 @@
 [Unit]
 Description=DHCPv6 client on %i
 Documentation=man:dhclient(8)
-RequiresMountsFor=/run
-ConditionPathExists=/run/dhclient6/%i.conf
-ConditionPathExists=/run/dhclient6/%i.options
+ConditionPathExists=/var/lib/dhcp/dhclient_v6_%i.conf
+ConditionPathExists=/var/lib/dhcp/dhclient_v6_%i.options
 After=vyos-router.service
 
 [Service]
-WorkingDirectory=/run/dhclient6
+WorkingDirectory=/var/lib/dhcp
 Type=exec
-EnvironmentFile=-/run/dhclient6/%i.options
-PIDFile=/run/dhclient6/%i.pid
+EnvironmentFile=-/var/lib/dhcp/dhclient_v6_%i.options
+PIDFile=/var/lib/dhcp/dhclient_v6_%i.pid
 ExecStart=/sbin/dhclient -6 $DHCLIENT_OPTS
+ExecStop=/sbin/dhclient -6 $DHCLIENT_OPTS -r
 Restart=always
 
 [Install]
-- 
cgit v1.2.3