diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-04-27 08:56:37 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-04-27 08:56:37 -0700 |
| commit | 80966545a12ee4e0de56874abbd2c86a0943cd1b (patch) | |
| tree | 9f7d970c607c33a13c58cd96e120ebf702ff0289 | |
| parent | 00795af8682d03f44e8c2e152beb87ec04e96e39 (diff) | |
| parent | 2f753503721cfb723a90d98e0ebb1089e5448532 (diff) | |
| download | vyatta-cfg-80966545a12ee4e0de56874abbd2c86a0943cd1b.tar.gz vyatta-cfg-80966545a12ee4e0de56874abbd2c86a0943cd1b.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg into jenner
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rwxr-xr-x | scripts/vyatta-interfaces.pl | 11 | ||||
| -rw-r--r-- | templates/priority | 10 |
3 files changed, 25 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index ee2b201..bb493b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +vyatta-cfg (0.14.68) unstable; urgency=low + + [ Stephen Hemminger ] + * Add support for virtual-ethernets + + [ Stig Thormodsrud ] + * Add more firewall priorities. + + -- Stig Thormodsrud <stig@vyatta.com> Sun, 26 Apr 2009 19:02:45 -0700 + vyatta-cfg (0.14.67) unstable; urgency=low [ Stephen Hemminger ] diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index 997230d..de5fa49 100755 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -46,7 +46,7 @@ use warnings; 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); +my ($check_name, $show_names, $intf_cli_path, $vif_name, $warn_name, $show_mtu); sub usage { print "Usage: $0 --dev=<interface> --check=<type>\n"; @@ -55,6 +55,7 @@ sub usage { print " $0 --dev=<interface> --eth-addr-update=<aa:aa:aa:aa:aa:aa>\n"; print " $0 --dev=<interface> --eth-addr-delete=<aa:aa:aa:aa:aa:aa>\n"; print " $0 --dev=<interface> --valid-addr={<a.b.c.d>|dhcp}\n"; + print " $0 --dev=<interface> --mtu\n"; print " $0 --show=<type>\n"; exit 1; } @@ -70,6 +71,7 @@ GetOptions("eth-addr-update=s" => \$eth_update, "show=s" => \$show_names, "vif=s" => \$vif_name, "warn" => \$warn_name, + "mtu" => \$show_mtu, ) or usage(); update_eth_addrs($eth_update, $dev) if ($eth_update); @@ -81,6 +83,7 @@ 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); +show_mtu($dev) if ($show_mtu); exit 0; sub is_ip_configured { @@ -152,6 +155,12 @@ sub get_mtu { return $intf->mtu(); } +sub show_mtu { + my $name = shift; + my $mtu = get_mtu($name); + print "$mtu\n" if $mtu; +} + sub dhcp_update_config { my ($conf_file, $intf) = @_; diff --git a/templates/priority b/templates/priority index c6e929d..64d2658 100644 --- a/templates/priority +++ b/templates/priority @@ -86,11 +86,11 @@ # 200 firewall/group -210 firewall/name -210 firewall/modify -210 firewall/ipv6-name -210 firewall/ipv6-modify -210 firewall +210 firewall/name/node.tag +210 firewall/modify/node.tag +210 firewall/ipv6-name/node.tag +210 firewall/ipv6-modify/node.tag +215 firewall 300 protocols/ospf 301 protocols/ospfv3 302 protocols/rip |