summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-08-17 13:07:22 +0200
committerChristian Breunig <christian@breunig.cc>2023-08-17 13:10:38 +0200
commit1a69e9bb4b4e81a6191cb3d48e36542c36a6b763 (patch)
treebf94497c7718ab94016e8cd92adb12867872afa9
parentd4e9652083ce5fc0dda9a2714231cdffe58b33f3 (diff)
downloadvyos-1x-1a69e9bb4b4e81a6191cb3d48e36542c36a6b763.tar.gz
vyos-1x-1a69e9bb4b4e81a6191cb3d48e36542c36a6b763.zip
Revert: dhcp: T5428: always release lease from default VRF
This reverts commit 9afcea251bdc895ffd49cb11f455fd636fdf817b A DHCP relese must also be originated from the VRF where the dhclient program is running, else the RELEASE message can not be send through the interface towards the DHCP server. The reason it did not work in the past was because of https://vyos.dev/T5476
-rw-r--r--data/templates/dhcp-client/override.conf.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/data/templates/dhcp-client/override.conf.j2 b/data/templates/dhcp-client/override.conf.j2
index 03fd71bf1..d09320270 100644
--- a/data/templates/dhcp-client/override.conf.j2
+++ b/data/templates/dhcp-client/override.conf.j2
@@ -10,6 +10,6 @@ ConditionPathExists={{ isc_dhclient_dir }}/dhclient_%i.conf
ExecStart=
ExecStart={{ vrf_command }}/sbin/dhclient -4 {{ dhclient_options }} {{ ifname }}
ExecStop=
-ExecStop=/sbin/dhclient -4 -r {{ dhclient_options }} {{ ifname }}
+ExecStop={{ vrf_command }}/sbin/dhclient -4 -r {{ dhclient_options }} {{ ifname }}
WorkingDirectory={{ isc_dhclient_dir }}
PIDFile={{ isc_dhclient_dir }}/dhclient_%i.pid