diff options
author | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-16 18:14:28 -0700 |
---|---|---|
committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-16 18:14:28 -0700 |
commit | 5ce44056a14f7b2e682da72229d43d0c0a3039da (patch) | |
tree | 58ea54fc847b0db48367111ed0e3dba74e1a8b2e | |
parent | 193c53b6bf9ec799c08f4c5822627cddbc288dcc (diff) | |
download | vyatta-cfg-quagga-5ce44056a14f7b2e682da72229d43d0c0a3039da.tar.gz vyatta-cfg-quagga-5ce44056a14f7b2e682da72229d43d0c0a3039da.zip |
remove low-level config dir usage
* "--path" option was using config dir directly.
* remove "--path" since it is unused.
-rwxr-xr-x | scripts/vyatta-interfaces.pl | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index a303c82c..f9426ac4 100755 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -49,8 +49,8 @@ my $dhcp_daemon = '/sbin/dhclient'; my ($eth_update, $eth_delete, $addr_set, $dev, $mac, $mac_update); my %skip_interface; -my ($check_name, $show_names, $intf_cli_path, $vif_name, $warn_name); -my ($check_up, $show_path, $dhcp_command); +my ($check_name, $show_names, $vif_name, $warn_name); +my ($check_up, $dhcp_command); my (@speed_duplex, @addr_commit); sub usage { @@ -63,7 +63,6 @@ Usage: $0 --dev=<interface> --check=<type> $0 --dev=<interface> --valid-addr-set={<a.b.c.d>|dhcp} $0 --dev=<interface> --valid-addr-commit={addr1 addr2 ...} $0 --dev=<interface> --speed-duplex=speed,duplex - $0 --dev=<interface> --path $0 --dev=<interface> --isup $0 --show=<type> EOF @@ -84,7 +83,6 @@ GetOptions("eth-addr-update=s" => \$eth_update, "skip=s" => sub { $skip_interface{$_[1]} = 1 }, "vif=s" => \$vif_name, "warn" => \$warn_name, - "path" => \$show_path, "isup" => \$check_up, "speed-duplex=s{2}" => \@speed_duplex, ) or usage(); @@ -99,7 +97,6 @@ dhcp($dhcp_command, $dev) if ($dhcp_command); is_valid_name($check_name, $dev) if ($check_name); exists_name($dev) if ($warn_name); show_interfaces($show_names) if ($show_names); -show_config_path($dev) if ($show_path); is_up($dev) if ($check_up); set_speed_duplex($dev, @speed_duplex) if (@speed_duplex); exit 0; @@ -540,19 +537,6 @@ sub show_interfaces { print join(' ', @match), "\n"; } -sub show_config_path { - my $name = shift; - die "Missing --dev argument\n" unless $name; - my $intf = new Vyatta::Interface($name); - die "$name does not match any known interface name type\n" - unless $intf; - my $level = $intf->path(); - die "$name does not have a known path\n" unless $level; - - $level =~ s/ /\//g; - print "/opt/vyatta/config/active/$level\n"; -} - sub get_ethtool { my $dev = shift; |