diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-11-30 00:05:35 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-11-30 00:05:35 +0100 |
| commit | 18fe96de5f9269cbb87cfb1c46d3baadf90eb59a (patch) | |
| tree | 213943613ae430f8865a119964f2d1af58ae4744 /scripts/vyatta-address | |
| parent | f95015ec976933baee5cfa643002fbef2b4a32fe (diff) | |
| parent | 0ebc3def62c13a19bcfb8d25ae479235ed376268 (diff) | |
| download | vyatta-cfg-system-18fe96de5f9269cbb87cfb1c46d3baadf90eb59a.tar.gz vyatta-cfg-system-18fe96de5f9269cbb87cfb1c46d3baadf90eb59a.zip | |
Merge branch 'current' into crux
Diffstat (limited to 'scripts/vyatta-address')
| -rwxr-xr-x | scripts/vyatta-address | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/vyatta-address b/scripts/vyatta-address index c3e57856..a35397de 100755 --- a/scripts/vyatta-address +++ b/scripts/vyatta-address @@ -29,7 +29,10 @@ case $1 in # Get current address from interface when using DHCP if [[ "$3" = "dhcp" ]]; then lease_file=/var/lib/dhcp/dhclient_"$2".leases; - ip_address=$(sed -n 's/^\s\sfixed-address\s\(.*\);/\1/p' $lease_file | sed -n '$p'); + ip=$(sed -n 's/^\s\sfixed-address\s\(.*\);/\1/p' $lease_file | sed -n '$p'); + #ip_address=$(sed -n 's/^\s\sfixed-address\s\(.*\);/\1/p' $lease_file | sed -n '$p'); + # T1053 we need IP/prefix for normalize-ip to function + ip_address=$(ip a s dev $2 | grep $ip | awk '{print $2}') elif [[ "$3" = "dhcpv6" ]]; then lease_file=/var/lib/dhcp/dhclient_v6_"$2".leases; ip_address=$(sed -n 's/^\s\s\s\siaaddr\s\(.*\)\s{/\1/p' $lease_file | sed -n '$p'); @@ -37,6 +40,7 @@ case $1 in ip_address=$3; fi + ### T1053 parameter $ip_address needs to be prefixed, not just the IP ip_address=$(/usr/libexec/vyos/system/normalize-ip $ip_address) if ! ip address show dev $2 2>/dev/null | grep -q "$ip_address"; then |