summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/vyatta-address7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/vyatta-address b/scripts/vyatta-address
index 3cc1755b..afe60191 100755
--- a/scripts/vyatta-address
+++ b/scripts/vyatta-address
@@ -28,8 +28,11 @@ case $1 in
delete)
# Get current address from interface when using DHCP
if [[ "$3" = "dhcp" ]]; then
- file=/var/lib/dhcp3/dhclient_"$2"_lease;
- ip_address=$(sed -n "/new_ip_address='/ s/.*\='*//p" $file | sed -n "s/'//p");
+ lease_file=/var/lib/dhcp3/dhclient_"$2".leases;
+ ip_address=$(sed -n 's/^\s\sfixed-address\s\(.*\);/\1/p' $lease_file | sed -n '$p');
+ elif [[ "$3" = "dhcpv6" ]]; then
+ lease_file=/var/lib/dhcp3/dhclient_v6_"$2".leases;
+ ip_address=$(sed -n 's/^\s\s\s\siaaddr\s\(.*\)\s{/\1/p' $lease_file | sed -n '$p');
else
ip_address=$3;
fi