summaryrefslogtreecommitdiff
path: root/src/etc
diff options
context:
space:
mode:
authorBrandon Stepler <brandon@stepler.net>2021-03-08 14:20:00 -0500
committerBrandon Stepler <brandon@stepler.net>2021-03-08 14:20:00 -0500
commitce0600e97baec18c1781605f3a80c26d4ed01e2b (patch)
tree7aca957c8e2d5b53ad78a359fe5be9a19a2626ed /src/etc
parent87bbe75152e3e0625776587c1fd4cd7104319fe1 (diff)
downloadvyos-1x-ce0600e97baec18c1781605f3a80c26d4ed01e2b.tar.gz
vyos-1x-ce0600e97baec18c1781605f3a80c26d4ed01e2b.zip
dhcp: T3392: fix VRF detection
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper4
1 files changed, 2 insertions, 2 deletions
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 8d996209f..fc035766b 100644
--- a/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper
+++ b/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper
@@ -52,8 +52,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"