diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-01 16:05:23 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-01 16:05:23 -0700 |
| commit | 0671794bb53957ba1ce25d0b6acb47f46ed738d5 (patch) | |
| tree | d246857beaf91c4eeb02ce23604107d5ba65b01e /templates/priority | |
| parent | 1b61a441d6faf8061c496110ec1ca90ac6bfdf1c (diff) | |
| parent | 00e011952b6271bef41e5c8c0e1bf67306e87d8c (diff) | |
| download | vyatta-cfg-0671794bb53957ba1ce25d0b6acb47f46ed738d5.tar.gz vyatta-cfg-0671794bb53957ba1ce25d0b6acb47f46ed738d5.zip | |
Merge branch 'jenner' into kenwood
Conflicts:
debian/changelog
Diffstat (limited to 'templates/priority')
| -rw-r--r-- | templates/priority | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/templates/priority b/templates/priority index 98d0bc0..1236b9d 100644 --- a/templates/priority +++ b/templates/priority @@ -105,6 +105,7 @@ 380 interfaces/openvpn 390 interfaces/pseudo-ethernet 391 interfaces/pseudo-ethernet/node.tag/vif +395 interfaces/bonding/node.tag/vif 400 system 450 protocols/static 470 policy @@ -119,57 +120,14 @@ 660 protocols/ripng 800 interfaces/ethernet/node.tag/vrrp 800 interfaces/ethernet/node.tag/vif/node.tag/vrrp -810 interfaces/bridge/node.tag/ip -810 interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip -810 interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip -810 interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip -810 interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip -810 interfaces/multilink/node.tag/vif/node.tag/ip -810 interfaces/loopback/node.tag/ip 810 interfaces/serial/node.tag/frame-relay/vif -810 interfaces/serial/node.tag/frame-relay/vif/node.tag/ip 810 interfaces/serial/node.tag/ppp 810 interfaces/serial/node.tag/ppp/vif -810 interfaces/serial/node.tag/ppp/vif/node.tag/ip 810 interfaces/serial/node.tag/cisco-hdlc/vif -810 interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip -810 interfaces/ethernet/node.tag/vif/node.tag/ip -810 interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip -810 interfaces/ethernet/node.tag/ip -810 interfaces/ethernet/node.tag/pppoe/node.tag/ip -810 interfaces/bonding/node.tag/vif/node.tag/ip -810 interfaces/bonding/node.tag/ip -810 interfaces/tunnel/node.tag/ip -810 interfaces/wirelessmodem/node.tag/ip -810 interfaces/openvpn/node.tag/ip -810 interfaces/pseudo-ethernet/node.tag/ip -810 interfaces/pseudo-ethernet/node.tag/vif/node.tag/ip -820 interfaces/bridge/node.tag/ipv6 -820 interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ipv6 -820 interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ipv6 -820 interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ipv6 -820 interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ipv6 -820 interfaces/multilink/node.tag/vif/node.tag/ipv6 -820 interfaces/loopback/node.tag/ipv6 820 interfaces/serial/node.tag/frame-relay/vif -820 interfaces/serial/node.tag/frame-relay/vif/node.tag/ipv6 820 interfaces/serial/node.tag/ppp 820 interfaces/serial/node.tag/ppp/vif -820 interfaces/serial/node.tag/ppp/vif/node.tag/ipv6 820 interfaces/serial/node.tag/cisco-hdlc/vif -820 interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ipv6 -820 interfaces/ethernet/node.tag/vif/node.tag/ipv6 -820 interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ipv6 -820 interfaces/ethernet/node.tag/ipv6 -820 interfaces/ethernet/node.tag/pppoe/node.tag/ipv6 -820 interfaces/bonding/node.tag/vif -820 interfaces/bonding/node.tag/vif/node.tag/ipv6 -820 interfaces/bonding/node.tag/ipv6 -820 interfaces/tunnel/node.tag/ipv6 -820 interfaces/wirelessmodem/node.tag/ipv6 -820 interfaces/openvpn/node.tag/ipv6 -810 interfaces/pseudo-ethernet/node.tag/ipv6 -810 interfaces/pseudo-ethernet/node.tag/vif/node.tag/ipv6 850 interfaces 900 protocols/snmp 900 vpn |