From 927ff3abba7610f7e70a4672bfd28156ace2915d Mon Sep 17 00:00:00 2001
From: Ross Dougherty <ross@dougherty.id.au>
Date: Wed, 20 Oct 2021 23:50:51 +1100
Subject: dhclient hooks: T3920: avoid 'too many args' error when no vrf

(cherry picked from commit 67b3dd6b4715fef266eb47e68623944f8be617e0)
---
 src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/etc/dhcp')

diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup b/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup
index 694d53b6b..fec792b64 100644
--- a/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup
+++ b/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup
@@ -15,10 +15,16 @@ if [[ $reason =~ (EXPIRE|FAIL|RELEASE|STOP) ]]; then
 
     if_metric="$IF_METRIC"
 
-    # try to delete default ip route 
+    # try to delete default ip route
     for router in $old_routers; do
-        logmsg info "Deleting default route: via $router dev ${interface} ${if_metric:+metric $if_metric}"
-        ip -4 route del default via $router dev ${interface} ${if_metric:+metric $if_metric}
+        # check if we are bound to a VRF
+        local vrf_name=$(basename /sys/class/net/${interface}/upper_* | sed -e 's/upper_//')
+        if [ "$vrf_name" != "*" ]; then
+            vrf="vrf $vrf_name"
+        fi
+
+        logmsg info "Deleting default route: via $router dev ${interface} ${if_metric:+metric $if_metric} ${vrf}"
+        ip -4 route del default via $router dev ${interface} ${if_metric:+metric $if_metric} ${vrf}
 
         if_metric=$((if_metric+1))
     done
-- 
cgit v1.2.3


From 393970f9ee5b3dfc58e0e999d3d5941a198b2c6f Mon Sep 17 00:00:00 2001
From: zsdc <taras@vyos.io>
Date: Mon, 25 Oct 2021 21:44:00 +0300
Subject: dhclient: T3940: Added lease file argument to the `dhclient -x` call

When `dhclient` with the `-x` option is used to stop running DHCP client
with a lease file that is not the same as in the new `dhclient` process,
it requires a `-lf` argument with a path to the old lease file to find
information about old/active leases and process them according to
instructions and config.

This commit adds the option to the `02-vyos-stopdhclient` hook, which
allows to properly process `dhclient` instances started in different
ways.
---
 src/etc/dhcp/dhclient-enter-hooks.d/02-vyos-stopdhclient | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/etc/dhcp')

diff --git a/src/etc/dhcp/dhclient-enter-hooks.d/02-vyos-stopdhclient b/src/etc/dhcp/dhclient-enter-hooks.d/02-vyos-stopdhclient
index f737148dc..ae6bf9f16 100644
--- a/src/etc/dhcp/dhclient-enter-hooks.d/02-vyos-stopdhclient
+++ b/src/etc/dhcp/dhclient-enter-hooks.d/02-vyos-stopdhclient
@@ -23,10 +23,12 @@ if [ -z ${CONTROLLED_STOP} ] ; then
         if ([ $dhclient -ne $current_dhclient ] && [ $dhclient -ne $master_dhclient ]); then
             # get path to PID-file of dhclient process
             local dhclient_pidfile=`ps --no-headers --format args --pid $dhclient | awk 'match(\$0, ".*-pf (/.*pid) .*", PF) { print PF[1] }'`
+            # get path to lease-file of dhclient process
+            local dhclient_leasefile=`ps --no-headers --format args --pid $dhclient | awk 'match(\$0, ".*-lf (/\\\S*leases) .*", LF) { print LF[1] }'`
             # stop dhclient with native command - this will run dhclient-script with correct reason unlike simple kill
-            logmsg info "Stopping dhclient with PID: ${dhclient}, PID file: $dhclient_pidfile"
+            logmsg info "Stopping dhclient with PID: ${dhclient}, PID file: ${dhclient_pidfile}, Leases file: ${dhclient_leasefile}"
             if [[ -e $dhclient_pidfile ]]; then
-                dhclient -e CONTROLLED_STOP=yes -x -pf $dhclient_pidfile
+                dhclient -e CONTROLLED_STOP=yes -x -pf $dhclient_pidfile -lf $dhclient_leasefile
             else
                 logmsg error "PID file $dhclient_pidfile does not exists, killing dhclient with SIGTERM signal"
                 kill -s 15 ${dhclient}
-- 
cgit v1.2.3