From 74f526c9c1fe782c604d2b88c1753d787dc696b4 Mon Sep 17 00:00:00 2001 From: Brandon Stepler Date: Mon, 8 Mar 2021 14:20:00 -0500 Subject: dhcp: T3392: fix VRF detection (cherry picked from commit ce0600e97baec18c1781605f3a80c26d4ed01e2b) --- src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/etc') diff --git a/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper b/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper index d1161e704..cf320fbbf 100644 --- a/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper +++ b/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper @@ -42,8 +42,8 @@ function iptovtysh () { fi # Add route to VRF routing table - local VTYSH_VRF_NAME=$(basename /sys/class/net/$VTYSH_DEV/upper_* | sed -e 's/upper_//') - if [ -n $VTYSH_VRF_NAME ]; then + local VTYSH_VRF_NAME=$(/usr/sbin/ip link show dev $VTYSH_DEV | sed -nre '1s/.* master ([^ ]*) .*/\1/p') + if /usr/sbin/ip -d link show dev $VTYSH_DEV | grep -q "vrf_slave"; then VTYSH_VRF="vrf $VTYSH_VRF_NAME" fi VTYSH_CMD="ip route $VTYSH_NETADDR $VTYSH_GATEWAY $VTYSH_DEV tag $VTYSH_TAG $VTYSH_DISTANCE $VTYSH_VRF" -- cgit v1.2.3