diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-02 17:10:07 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-02 17:10:07 -0800 |
| commit | 3d9cf09618b1bcfc25c632f6582e5e2ca0908754 (patch) | |
| tree | f27a7f3a380ecade1e302d770ef8b0b66090aa4e | |
| parent | 8df891c9a2d99a0e34c19cb01b2521899b6d566d (diff) | |
| parent | 1ec704bb9deb6e508d2aa3ff43ab59b145ce1f2d (diff) | |
| download | vyatta-cfg-3d9cf09618b1bcfc25c632f6582e5e2ca0908754.tar.gz vyatta-cfg-3d9cf09618b1bcfc25c632f6582e5e2ca0908754.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg into jenner
| -rwxr-xr-x | lib/Vyatta/Misc.pm | 3 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vif/node.def | 6 | ||||
| -rw-r--r-- | templates/priority | 20 |
3 files changed, 17 insertions, 12 deletions
diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm index fad3eb2..eccd715 100755 --- a/lib/Vyatta/Misc.pm +++ b/lib/Vyatta/Misc.pm @@ -93,7 +93,8 @@ sub generate_dhclient_intf_files { sub getInterfaces { opendir (my $sys_class, '/sys/class/net') or die "can't open /sys/class/net: $!"; - my @interfaces = grep !/^\./, readdir $sys_class; + my @interfaces = + grep { ( !/^\./ ) && ( $_ ne 'bonding_masters' ) } readdir $sys_class; closedir $sys_class; return @interfaces; } diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index 2166f80..e496a7c 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -5,6 +5,10 @@ syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 a create: sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) sudo ip link set "$VAR(../@).$VAR(@)" up /opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on -delete: sudo ip link delete link "$VAR(../@).$VAR(@)" type vlan id $VAR(@) +delete: sudo ip link delete "$VAR(../@).$VAR(@)" type vlan id $VAR(@) comp_help: possible completions: <0-4094> Set VLAN ID + + + + diff --git a/templates/priority b/templates/priority index cb43734..69b4c04 100644 --- a/templates/priority +++ b/templates/priority @@ -4,15 +4,15 @@ 301 protocols/ospfv3 302 protocols/rip 303 protocols/ripng -310 interfaces/bonding/node.tag -320 interfaces/bridge/node.tag -330 interfaces/ethernet/node.tag -340 interfaces/tunnel/node.tag -350 interfaces/adsl/node.tag -360 interfaces/loopback/node.tag -370 interfaces/openvpn/node.tag -480 interfaces/serial/node.tag -490 interfaces/wirelessmodem/node.tag +310 interfaces/ethernet/node.tag +320 interfaces/loopback/node.tag +330 interfaces/adsl/node.tag +340 interfaces/serial/node.tag +350 interfaces/wirelessmodem/node.tag +360 interfaces/bonding/node.tag +370 interfaces/bridge/node.tag +380 interfaces/tunnel/node.tag +380 interfaces/openvpn/node.tag 400 system 450 protocols/static 470 policy @@ -74,4 +74,4 @@ 900 content-inspection 900 load-balancing 900 service -900 protocols
\ No newline at end of file +900 protocols |