removed out of date priority values from priority file

2 files changed, 4 insertions, 103 deletions

diff --git a/Makefile.am b/Makefile.am
index 54ef9d6..cd8ce56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ src_check_tmpl_SOURCES = src/check_tmpl.c
 sbin_SCRIPTS = scripts/vyatta-cfg-cmd-wrapper
 sbin_SCRIPTS += scripts/vyatta-validate-type.pl
 sbin_SCRIPTS += scripts/vyatta-find-type.pl
+sbin_SCRIPTS += scripts/priority.pl
 sbin_SCRIPTS  += scripts/vyatta-config-loader.pl
 sbin_SCRIPTS  += scripts/vyatta-config-gen-sets.pl
 sbin_SCRIPTS  += scripts/vyatta-cli-expand-var.pl
diff --git a/templates/priority b/templates/priority
index e32a5c0..2359178 100644
--- a/templates/priority
+++ b/templates/priority
@@ -92,107 +92,7 @@
 # "active config" tree at the time the lower-level node is committed.
 # 
 
-200 firewall/group/address-group
-200 firewall/group/network-group
-200 firewall/group/port-group
-210 firewall/name/node.tag
-210 firewall/modify/node.tag
-210 firewall/ipv6-name/node.tag
-210 firewall/ipv6-modify/node.tag
-215 firewall
-310 interfaces/bridge
-315 interfaces/bonding
-318 interfaces/ethernet
-319 interfaces/ethernet/node.tag/vif
-319 interfaces/ethernet/node.tag/bond-group
-320 interfaces/ethernet/node.tag/vif/node.tag/bridge-group
-320 interfaces/bonding/node.tag/bridge-group
-320 interfaces/bonding/node.tag/vif
-320 interfaces/bridge/node.tag/address
-320 interfaces/loopback
-330 interfaces/adsl
-340 interfaces/serial
-350 interfaces/wirelessmodem
-350 interfaces/wireless
-380 interfaces/tunnel
-380 interfaces/openvpn
-390 interfaces/pseudo-ethernet
-391 interfaces/pseudo-ethernet/node.tag/vif
-400 system/domain-name
-400 system/domain-search
-400 system/gateway-address
-400 system/host-name
-400 system/ip
-400 system/ipv6
-400 system/login
-400 system/name-server
-400 system/ntp-server
-400 system/options
-400 system/package
-400 system/static-host-mapping
-400 system/syslog
-400 system/time-zone
-405 system
-450 protocols/static
-470 policy
-500 protocols/bgp/node.tag/parameters
-510 protocols/bgp/node.tag/neighbor
-520 protocols/bgp
-610 protocols/ospf/parameters
-620 protocols/ospf
-630 protocols/ospfv3/parameters
-640 protocols/ospfv3
-650 protocols/rip
-660 protocols/ripng
-800 interfaces/ethernet/node.tag/vrrp
-800 interfaces/ethernet/node.tag/vif/node.tag/vrrp
-810 interfaces/serial/node.tag/frame-relay/vif
-810 interfaces/serial/node.tag/ppp
-810 interfaces/serial/node.tag/ppp/vif
-810 interfaces/serial/node.tag/cisco-hdlc/vif
-850 interfaces
 
-# Router advertisement daemon startup should take place after interfaces
-# have been fully configured.  We have a router-advert node under just about
-# every interface type, hence the large number of priority nodes in this
-# source file.  They can be removed from this source file once bug 4903
-# is fixed
-860 interfaces/ethernet/node.tag/ipv6/router-advert
-860 interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/router-advert
-860 interfaces/ethernet/node.tag/vif/node.tag/ipv6/router-advert
-860 interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ipv6/router-advert
-860 interfaces/bonding/node.tag/ipv6/router-advert
-860 interfaces/bonding/node.tag/vif/node.tag/ipv6/router-advert
-860 interfaces/tunnel/node.tag/ipv6/router-advert
-860 interfaces/bridge/node.tag/ipv6/router-advert
-860 interfaces/openvpn/node.tag/ipv6/router-advert
-860 interfaces/wirelessmodem/node.tag/ipv6/router-advert
-860 interfaces/multilink/node.tag/vif/node.tag/ipv6/router-advert
-860 interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ipv6/router-advert
-860 interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ipv6/router-advert
-860 interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ipv6/router-advert
-860 interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ipv6/router-advert
-860 interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ipv6/router-advert
-860 interfaces/serial/node.tag/frame-relay/vif/node.tag/ipv6/router-advert
-860 interfaces/serial/node.tag/ppp/vif/node.tag/ipv6/router-advert
-
-900 vpn
-900 qos-policy
-900 test-definition
-900 content-inspection
-900 load-balancing
-900 protocols
-900 service
-910 service/dhcp-relay
-911 service/dhcp-server
-913 service/https
-914 service/nat
-915 service/ssh
-916 service/telnet
-917 service/webproxy
-918 service/dns/forwarding
-919 service/dns/dynamic
-960 cluster
-970 zone-policy/zone/node.tag/from
-975 zone-policy
-980 protocols/snmp
+#
+# RUN perl /opt/vyatta/sbin/priority.pl to generate the current priority listings
+#
\ No newline at end of file