diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-29 15:06:05 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-29 15:12:04 +0200 |
| commit | af87333fe4164c9d37f8d21d50dd4e164378c709 (patch) | |
| tree | 19e2c173256a5be2ac1285ed29cbbd4d5c7fe0e0 /src/systemd | |
| parent | 1d909e0c5358a0d733baffe6cd533d21927ed147 (diff) | |
| download | vyos-1x-af87333fe4164c9d37f8d21d50dd4e164378c709.tar.gz vyos-1x-af87333fe4164c9d37f8d21d50dd4e164378c709.zip | |
dhclient: T2393: switch to old configuration path to keep existing op-mode tolls intact
Diffstat (limited to 'src/systemd')
| -rw-r--r-- | src/systemd/dhclient6@.service | 12 | ||||
| -rw-r--r-- | src/systemd/dhclient@.service | 11 |
2 files changed, 11 insertions, 12 deletions
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] diff --git a/src/systemd/dhclient@.service b/src/systemd/dhclient@.service index 1040ce2b2..2ced1038a 100644 --- a/src/systemd/dhclient@.service +++ b/src/systemd/dhclient@.service @@ -1,16 +1,15 @@ [Unit] Description=DHCP client on %i Documentation=man:dhclient(8) -RequiresMountsFor=/run -ConditionPathExists=/run/dhclient/%i.conf -ConditionPathExists=/run/dhclient/%i.options +ConditionPathExists=/var/lib/dhcp/dhclient_%i.conf +ConditionPathExists=/var/lib/dhcp/dhclient_%i.options After=vyos-router.service [Service] -WorkingDirectory=/run/dhclient +WorkingDirectory=/var/lib/dhcp Type=exec -EnvironmentFile=-/run/dhclient/%i.options -PIDFile=/run/dhclient/%i.pid +EnvironmentFile=-/var/lib/dhcp/dhclient_%i.options +PIDFile=/var/lib/dhcp/dhclient_%i.pid ExecStart=/sbin/dhclient -4 $DHCLIENT_OPTS ExecStop=/sbin/dhclient -4 $DHCLIENT_OPTS -r Restart=always |