Merge branch 'jenner' into kenwood

Conflicts:
	debian/changelog

3 files changed, 5 insertions, 51 deletions

diff --git a/debian/changelog b/debian/changelog
index a139faa..e37bfe5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-vyatta-cfg (0.14.92) unstable; urgency=low
-
-  * UNRELEASED
-
- -- An-Cheng Huang <ancheng@vyatta.com>  Fri, 29 May 2009 18:35:41 -0700
-
 vyatta-cfg (0.14.91) unstable; urgency=low
 
   * Bugfix 4235: Code cleanup.
diff --git a/src/common/unionfs.c b/src/common/unionfs.c
index b259b5d..24ff28f 100644
--- a/src/common/unionfs.c
+++ b/src/common/unionfs.c
@@ -980,8 +980,10 @@ get_term_data_values(GNode *node)
     data = (struct ValueData*)calloc(1, sizeof(struct ValueData));
     if ((tok_str_active == NULL || tok_str_active[0] == NULL) &&
 	(tok_str_new == NULL || tok_str_new[0] == NULL)) {
-  //      data->_state = K_NO_OP;
-  //      g_datalist_set_data(&datalist, tok_str_active[0], data);
+      cp = malloc(MAX_LENGTH_DIR_PATH*sizeof(char));
+      cp[0] = '\0';
+      data->_state = ((struct VyattaNode*)node->parent->data)->_data._operation;
+      g_datalist_set_data(&datalist, cp, data);
     }
     else if (tok_str_active == NULL || tok_str_active[0] == NULL) {
       data->_state = K_CREATE_OP;
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