summaryrefslogtreecommitdiff
path: root/src/etc/dhcp/dhclient-exit-hooks.d
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2021-04-15 00:20:44 +0300
committerzsdc <taras@vyos.io>2021-04-15 01:37:50 +0300
commit9ec8e2b6dc8144d4d5a17e53b1c183e22497580f (patch)
tree7df03db148712657d1df09f1fa026bb918331aa2 /src/etc/dhcp/dhclient-exit-hooks.d
parentf0c8d0be34ca3475b6e7f5da71cedb0bd4b5fd96 (diff)
downloadvyos-1x-9ec8e2b6dc8144d4d5a17e53b1c183e22497580f.tar.gz
vyos-1x-9ec8e2b6dc8144d4d5a17e53b1c183e22497580f.zip
dhclient: T3392: Changed dhclient-script hooks for VRF
There were two problems with VRF support inside dhclient-script: - VRF check inside the `01-vyos-cleanup` hook was needless because it will be done inside the `03-vyos-ipwrapper` anyway; - VRF was ignored for in-kernel routes in `03-vyos-ipwrapper`. Theoretically, there must be no situation now when this can leads to a real problem, but better will be to keep both kernel and FRR backends in sync. Also, the way to get and use a VRF name was changed to an easier one.
Diffstat (limited to 'src/etc/dhcp/dhclient-exit-hooks.d')
-rw-r--r--src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup10
1 files changed, 2 insertions, 8 deletions
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 edb7c7b27..694d53b6b 100644
--- a/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup
+++ b/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup
@@ -17,14 +17,8 @@ if [[ $reason =~ (EXPIRE|FAIL|RELEASE|STOP) ]]; then
# try to delete default ip route
for router in $old_routers; do
- # check if we are bound to a VRF
- local vrf_name=$(basename /sys/class/net/${interface}/upper_* | sed -e 's/upper_//')
- if [ -n $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}
+ 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}
if_metric=$((if_metric+1))
done