partial fix for bug 4903.

31 files changed, 31 insertions, 0 deletions

diff --git a/templates/interfaces/bonding/node.def b/templates/interfaces/bonding/node.def
index cc86c89a..f4ed5eb8 100644
--- a/templates/interfaces/bonding/node.def
+++ b/templates/interfaces/bonding/node.def
@@ -1,3 +1,4 @@
+priority: 315
 tag:
 type: txt
 help: Set bonding interface
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/bridge-group/node.def
index fc3af5f5..dc82ec7a 100644
--- a/templates/interfaces/bonding/node.tag/bridge-group/node.def
+++ b/templates/interfaces/bonding/node.tag/bridge-group/node.def
@@ -1,3 +1,4 @@
+priority: 320
 help: Add this interface to a bridge group
 
 create: sudo brctl addif $VAR(./bridge/@) $VAR(../@);
diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def
index 0e292217..e0282431 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.def
@@ -1,3 +1,4 @@
+priority: 320
 tag:
 type: u32
 help: Set Virtual Local Area Network (VLAN) ID
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def
index e70c9041..1ac499db 100644
--- a/templates/interfaces/bridge/node.def
+++ b/templates/interfaces/bridge/node.def
@@ -1,3 +1,4 @@
+priority: 310
 tag:
 type: txt
 help: Set bridge interface
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def
index aef29948..5f57d5fc 100644
--- a/templates/interfaces/bridge/node.tag/address/node.def
+++ b/templates/interfaces/bridge/node.tag/address/node.def
@@ -1,3 +1,4 @@
+priority: 320
 multi:
 type: txt
 help: Set an IP address for this interface
diff --git a/templates/interfaces/ethernet/node.tag/bond-group/node.def b/templates/interfaces/ethernet/node.tag/bond-group/node.def
index b29901a8..7b6df036 100644
--- a/templates/interfaces/ethernet/node.tag/bond-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/bond-group/node.def
@@ -1,3 +1,4 @@
+priority: 319
 type: txt
 help: Add this interface to a bonding group
 commit:expression: exec \
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def
index b36ad085..0bade03a 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def
@@ -1,3 +1,4 @@
+priority: 320
 help: Add this interface to a bridge group
 
 end:
diff --git a/templates/interfaces/pseudo-ethernet/node.def b/templates/interfaces/pseudo-ethernet/node.def
index 60343e7d..780014ae 100644
--- a/templates/interfaces/pseudo-ethernet/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.def
@@ -1,3 +1,4 @@
+priority: 390
 tag:
 type: txt
 help: Set Virtual Ethernet device
diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def
index 77aaa5fa..a9e291d7 100644
--- a/templates/interfaces/tunnel/node.def
+++ b/templates/interfaces/tunnel/node.def
@@ -1,3 +1,4 @@
+priority: 380
 tag:
 type: txt
 help: Set tunnel interface
diff --git a/templates/protocols/snmp/node.def b/templates/protocols/snmp/node.def
index 3612f2b6..ad81892c 100644
--- a/templates/protocols/snmp/node.def
+++ b/templates/protocols/snmp/node.def
@@ -1,3 +1,4 @@
+priority: 980
 help: Configure Simple Network Management Protocol (SNMP)
 commit:expression: $VAR(community/) != ""; "must configure a community"
 create:expression: "/opt/vyatta/sbin/vyatta-snmp.pl --init-snmp"
diff --git a/templates/service/dns/dynamic/node.def b/templates/service/dns/dynamic/node.def
index 99356334..54615bea 100644
--- a/templates/service/dns/dynamic/node.def
+++ b/templates/service/dns/dynamic/node.def
@@ -1,2 +1,3 @@
+priority: 919
 help: Configure Dynamic DNS
 commit:expression: $VAR(./interface/@@) != ""; "At least one interface must be set to send DDNS updates for"
diff --git a/templates/service/dns/forwarding/node.def b/templates/service/dns/forwarding/node.def
index 12d7bb51..2c42b1c3 100644
--- a/templates/service/dns/forwarding/node.def
+++ b/templates/service/dns/forwarding/node.def
@@ -1,3 +1,4 @@
+priority: 918
 help: Configure DNS forwarding
 commit:expression: $VAR(./listen-on) != ""; "At least one interface must be configured for DNS forwarding parameter 'listen-on'"
 delete:expression: "touch /tmp/dnsmasq.$PPID"
diff --git a/templates/service/node.def b/templates/service/node.def
index a2441db9..e9040da1 100644
--- a/templates/service/node.def
+++ b/templates/service/node.def
@@ -1 +1,2 @@
+priority: 900
 help: Configure specified service
diff --git a/templates/service/ssh/node.def b/templates/service/ssh/node.def
index dbe32a6f..ecf54e41 100644
--- a/templates/service/ssh/node.def
+++ b/templates/service/ssh/node.def
@@ -1,3 +1,4 @@
+priority: 915
 help: Enable/disable Secure SHell (SSH) protocol
 delete:sudo /usr/sbin/invoke-rc.d ssh stop 
        sudo sh -c "echo 'SSHD_OPTS=' > /etc/default/ssh"
diff --git a/templates/service/telnet/node.def b/templates/service/telnet/node.def
index eefb3b4a..9b2814aa 100644
--- a/templates/service/telnet/node.def
+++ b/templates/service/telnet/node.def
@@ -1,3 +1,4 @@
+priority: 916
 help: Enable/disable Network Virtual Terminal Protocol (TELNET) protocol
 create: touch /tmp/vyatta-telnet.$PPID
 delete: /opt/vyatta/sbin/vyatta_update_telnet disable
diff --git a/templates/system/domain-name/node.def b/templates/system/domain-name/node.def
index 2ddc8e44..96ccc7ae 100644
--- a/templates/system/domain-name/node.def
+++ b/templates/system/domain-name/node.def
@@ -1,3 +1,4 @@
+priority: 400
 type: txt
 help: Set system domain name
 syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]{0,63}$" ; "invalid domain name $VAR(@)"
diff --git a/templates/system/domain-search/node.def b/templates/system/domain-search/node.def
index b51158e6..49c7d171 100644
--- a/templates/system/domain-search/node.def
+++ b/templates/system/domain-search/node.def
@@ -1 +1,2 @@
+priority: 400
 help: Set Domain Name Server (DNS) domain completion order
diff --git a/templates/system/host-name/node.def b/templates/system/host-name/node.def
index 97b9f9a6..94f38b93 100644
--- a/templates/system/host-name/node.def
+++ b/templates/system/host-name/node.def
@@ -1,3 +1,4 @@
+priority: 400
 type: txt
 help: Set system host name (default: vyatta)
 default: "vyatta"
diff --git a/templates/system/ip/node.def b/templates/system/ip/node.def
index c354d882..3b495f3d 100644
--- a/templates/system/ip/node.def
+++ b/templates/system/ip/node.def
@@ -1 +1,2 @@
+priority: 400
 help: Set IPv4 settings
diff --git a/templates/system/ipv6/node.def b/templates/system/ipv6/node.def
index 7a7c2715..587c3b2b 100644
--- a/templates/system/ipv6/node.def
+++ b/templates/system/ipv6/node.def
@@ -1 +1,2 @@
+priority: 400
 help: Set IPv6 settings
diff --git a/templates/system/login/node.def b/templates/system/login/node.def
index 9b24a71f..47878e1e 100644
--- a/templates/system/login/node.def
+++ b/templates/system/login/node.def
@@ -1,3 +1,4 @@
+priority: 400
 help: Set user access
 delete: echo 'All login methods can not be deleted' 1>&2; exit 1
 end: /opt/vyatta/sbin/vyatta_update_login.pl
diff --git a/templates/system/name-server/node.def b/templates/system/name-server/node.def
index 4cbd7741..34187454 100644
--- a/templates/system/name-server/node.def
+++ b/templates/system/name-server/node.def
@@ -1,3 +1,4 @@
+priority: 400
 multi:
 type: ipv4
 help: Set Domain Name Server (DNS)
diff --git a/templates/system/node.def b/templates/system/node.def
index 3e437873..2317e7dd 100644
--- a/templates/system/node.def
+++ b/templates/system/node.def
@@ -1 +1,2 @@
+priority: 405
 help: Configure system parameters
diff --git a/templates/system/ntp-server/node.def b/templates/system/ntp-server/node.def
index c8e3a9f2..e1ee4c97 100644
--- a/templates/system/ntp-server/node.def
+++ b/templates/system/ntp-server/node.def
@@ -1,3 +1,4 @@
+priority: 400
 multi:
 type: txt
 help: Set name or IP address of Network Time Protocol (NTP) server
diff --git a/templates/system/options/node.def b/templates/system/options/node.def
index 96cb8037..ace7abbe 100644
--- a/templates/system/options/node.def
+++ b/templates/system/options/node.def
@@ -1 +1,2 @@
+priority: 400
 help: Set system options
diff --git a/templates/system/package/node.def b/templates/system/package/node.def
index f0debd11..3ed94f80 100644
--- a/templates/system/package/node.def
+++ b/templates/system/package/node.def
@@ -1 +1,2 @@
+priority: 400
 help: Set package update repository parameters
diff --git a/templates/system/static-host-mapping/node.def b/templates/system/static-host-mapping/node.def
index 0eeace02..fbc69aa7 100644
--- a/templates/system/static-host-mapping/node.def
+++ b/templates/system/static-host-mapping/node.def
@@ -1 +1,2 @@
+priority: 400
 help: Set to map DNS names to system interfaces
diff --git a/templates/system/syslog/node.def b/templates/system/syslog/node.def
index 9e3254e1..90000f8c 100644
--- a/templates/system/syslog/node.def
+++ b/templates/system/syslog/node.def
@@ -1,3 +1,4 @@
+priority: 400
 help: Configure syslog daemon
 end: if /opt/vyatta/sbin/vyatta_update_syslog.pl; then
           sudo /usr/sbin/invoke-rc.d sysklogd reload
diff --git a/templates/system/time-zone/node.def b/templates/system/time-zone/node.def
index 00179850..be8b0992 100644
--- a/templates/system/time-zone/node.def
+++ b/templates/system/time-zone/node.def
@@ -1,3 +1,4 @@
+priority: 400
 type: txt
 help: Set local timezone
 default: "GMT"
diff --git a/templates/zone-policy/node.def b/templates/zone-policy/node.def
index c4b62433..c374bdbd 100644
--- a/templates/zone-policy/node.def
+++ b/templates/zone-policy/node.def
@@ -1,3 +1,4 @@
+priority: 975
 help: Configure zone-policy
 begin: 
 if ! /opt/vyatta/sbin/vyatta-zone.pl --action=validity-checks --zone-name=none --silent-validate=false; then
diff --git a/templates/zone-policy/zone/node.tag/from/node.def b/templates/zone-policy/zone/node.tag/from/node.def
index 4b664769..fcbaf38c 100644
--- a/templates/zone-policy/zone/node.tag/from/node.def
+++ b/templates/zone-policy/zone/node.tag/from/node.def
@@ -1,4 +1,5 @@
 tag:
+priority: 970
 type: txt
 help: Set zone from which to filter traffic