summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-04-21 17:29:54 -0700
committerStig Thormodsrud <stig@vyatta.com>2009-04-21 17:29:54 -0700
commita268ffeead692a7024d49d0978b75d900aec4146 (patch)
treed7a7f28ba4fde6a6cfe1b903bdff0af519bd0319 /scripts
parenta9ee6ae9f37d066a022341ecc472e9560bc64fb1 (diff)
parent0d5eba684254f37950583badc6d84b38b283afed (diff)
downloadvyatta-cfg-a268ffeead692a7024d49d0978b75d900aec4146.tar.gz
vyatta-cfg-a268ffeead692a7024d49d0978b75d900aec4146.zip
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg into jenner
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vyatta-interfaces.pl27
1 files changed, 12 insertions, 15 deletions
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index d647e96..8fc5226 100755
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -48,7 +48,7 @@ my $dhcp_daemon = '/sbin/dhclient';
my ($eth_update, $eth_delete, $addr, $dev, $mac, $mac_update, $op_dhclient);
my ($check_name, $show_names, $intf_cli_path, $vif_name, $warn_name);
-sub usage() {
+sub usage {
print "Usage: $0 --dev=<interface> --check=<type>\n";
print " $0 --dev=<interface> --warn\n";
print " $0 --dev=<interface> --valid-mac=<aa:aa:aa:aa:aa:aa>\n";
@@ -69,18 +69,19 @@ GetOptions("eth-addr-update=s" => \$eth_update,
"check=s" => \$check_name,
"show=s" => \$show_names,
"vif=s" => \$vif_name,
- "warn", => \$warn_name,
+ "warn" => \$warn_name,
) or usage();
-if ($eth_update) { update_eth_addrs($eth_update, $dev); }
-if ($eth_delete) { delete_eth_addrs($eth_delete, $dev); }
-if ($addr) { is_valid_addr($addr, $dev); }
-if ($mac) { is_valid_mac($mac, $dev); }
-if ($mac_update) { update_mac($mac_update, $dev); }
-if ($op_dhclient) { op_dhcp_command($op_dhclient, $dev); }
-if ($check_name) { is_valid_name($check_name, $dev); }
-if ($warn_name) { exists_name($dev); }
-if ($show_names) { show_interfaces($show_names); }
+update_eth_addrs($eth_update, $dev) if ($eth_update);
+delete_eth_addrs($eth_delete, $dev) if ($eth_delete);
+is_valid_addr($addr, $dev) if ($addr);
+is_valid_mac($mac, $dev) if ($mac);
+update_mac($mac_update, $dev) if ($mac_update);
+op_dhcp_command($op_dhclient, $dev) if ($op_dhclient);
+is_valid_name($check_name, $dev) if ($check_name);
+exists_name($dev) if ($warn_name);
+show_interfaces($show_names) if ($show_names);
+exit 0;
sub is_ip_configured {
my ($intf, $ip) = @_;
@@ -484,7 +485,3 @@ sub show_interfaces {
}
print join(' ', @match), "\n";
}
-
-exit 0;
-
-# end of file