summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@io.vyatta.com>2008-12-15 15:44:44 -0800
committerStig Thormodsrud <stig@io.vyatta.com>2008-12-15 15:44:44 -0800
commit0b582e0ca240c9a809f2fed2d3bf3bb339f2b365 (patch)
treee340224defaa26a5a098c49874e7b02f053fab28
parent3520dc63a346e261f89cc60fa7ae36e5fd4f4c64 (diff)
downloadvyatta-cfg-0b582e0ca240c9a809f2fed2d3bf3bb339f2b365.tar.gz
vyatta-cfg-0b582e0ca240c9a809f2fed2d3bf3bb339f2b365.zip
Fix 3991: Unable to configure DHCP server on a multinetted interface.
-rwxr-xr-xscripts/VyattaMisc.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/VyattaMisc.pm b/scripts/VyattaMisc.pm
index 7072908..89d68d6 100755
--- a/scripts/VyattaMisc.pm
+++ b/scripts/VyattaMisc.pm
@@ -56,10 +56,12 @@ sub getInterfacesIPadresses {
$is_intf_interface_type = 1;
}
if ($is_intf_interface_type > 0) {
- $intf_ips[$intf_ips_index] =
+ my @ips = ();
+ @ips =
`ip addr show $intf_system 2>/dev/null | grep inet | grep -v inet6 | awk '{print \$2}'`;
- if (!($intf_ips[$intf_ips_index] eq '')){
- $intf_ips_index++;
+ chomp @ips;
+ if (scalar(@ips) > 0){
+ push @intf_ips, @ips;
}
}
}