diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-10-20 11:22:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-20 11:22:18 +0300 |
| commit | 57070a6b931fd9e80c423f0b10db32b6ba4296d9 (patch) | |
| tree | 875f01087f8617a11443e39e9141769e9ea86b7a /src | |
| parent | b96e904cea9d5165b0b2cb2c1b318a22a127ff3a (diff) | |
| parent | 6a5cd3b87b2dee397ddb4a72dffd25e4e24122f1 (diff) | |
| download | vyos-1x-57070a6b931fd9e80c423f0b10db32b6ba4296d9.tar.gz vyos-1x-57070a6b931fd9e80c423f0b10db32b6ba4296d9.zip | |
Merge pull request #4800 from c-po/vrf-name-dhcp-fix
T7941: fix DHCP client running in VRF with non-word characters
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper | 2 |
1 files changed, 1 insertions, 1 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 2a1c5a7b2..1f27ee14c 100644 --- a/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper +++ b/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper @@ -4,7 +4,7 @@ IF_METRIC=${IF_METRIC:-210} # Check if interface is inside a VRF -VRF_OPTION=$(/usr/sbin/ip -j -d link show ${interface} | awk '{if(match($0, /.*"master":"(\w+)".*"info_slave_kind":"vrf"/, IFACE_DETAILS)) printf("vrf %s", IFACE_DETAILS[1])}') +VRF_OPTION=$(/usr/sbin/ip --json --detail link show ${interface} | jq -r '.[0] | select(.linkinfo.info_slave_kind == "vrf") | "vrf \(.master)"') # get status of FRR function frr_alive () { |