diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-08-05 09:01:10 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-08-05 09:28:03 +0200 |
| commit | 96132f582ef698b84d08e5ff207e508ed0f9c5f7 (patch) | |
| tree | 1f4f09492d1b3b5617ed34a315b8e1e49e4a7cb0 | |
| parent | 782e400d6f276a8a4ee51c92f02e01e7695f55fb (diff) | |
| download | vyos-1x-96132f582ef698b84d08e5ff207e508ed0f9c5f7.tar.gz vyos-1x-96132f582ef698b84d08e5ff207e508ed0f9c5f7.zip | |
dhcp: T5428: remove hardcoded path to client runtime directories
| -rw-r--r-- | data/templates/dhcp-client/override.conf.j2 | 2 | ||||
| -rw-r--r-- | src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/dhcp-client/override.conf.j2 b/data/templates/dhcp-client/override.conf.j2 index fcb23cb52..d4d5eb49f 100644 --- a/data/templates/dhcp-client/override.conf.j2 +++ b/data/templates/dhcp-client/override.conf.j2 @@ -1,7 +1,7 @@ ### Autogenerated by interface.py ### {% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' ' if vrf is vyos_defined else '' %} {% set if_metric = '-e IF_METRIC=' ~ dhcp_options.default_route_distance if dhcp_options.default_route_distance is vyos_defined else '' %} -{% set dhclient_options = '-d -nw -cf /var/lib/dhcp/dhclient_' ~ ifname ~ '.conf -pf /var/lib/dhcp/dhclient_' ~ ifname ~ '.pid -lf /var/lib/dhcp/dhclient_' ~ ifname ~ '.leases ' ~ if_metric %} +{% set dhclient_options = '-d -nw -cf ' ~ isc_dhclient_dir ~ '/dhclient_' ~ ifname ~ '.conf -pf ' ~ isc_dhclient_dir ~ '/dhclient_' ~ ifname ~ '.pid -lf ' ~ isc_dhclient_dir ~ '/dhclient_' ~ ifname ~ '.leases ' ~ if_metric %} [Unit] ConditionPathExists={{ isc_dhclient_dir }}/dhclient_%i.conf diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook b/src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook index 49bb18372..e828b433e 100644 --- a/src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook +++ b/src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook @@ -28,7 +28,7 @@ if [[ $reason =~ ^(REBOOT6|INIT6|EXPIRE6|RELEASE6|STOP6|INFORM6|BOUND6|REBIND6|D fi if [ "$RUN" = "yes" ]; then - LOG=/var/lib/dhcp/dhclient_"$interface"."$proto"lease + LOG=/run/dhclient/dhclient_"$interface"."$proto"lease echo `date` > $LOG for i in reason interface new_expiry new_dhcp_lease_time medium \ |