From 7fbebb1457fd831d73f27c0edce7ce027432d742 Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Fri, 29 May 2009 18:31:19 -0700 Subject: 0.14.91+jenner1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e37bfe5..6784a3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg (0.14.91+jenner1) unstable; urgency=low + + * UNRELEASED + + -- An-Cheng Huang Fri, 29 May 2009 18:31:19 -0700 + vyatta-cfg (0.14.91) unstable; urgency=low * Bugfix 4235: Code cleanup. -- cgit v1.2.3 From f84b8fa4a0e06097646dfd384ad6a227365a27d5 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 1 Jun 2009 08:04:09 -0700 Subject: Remove special case for interfaces ... /ip Don't need OSPF/RIP parameters set after protocols/ospf anymore. Setting bandwidth, etc after OSPF could cause unnecessary flapping. --- templates/priority | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3 From fdb11ac2eaa58abc67f41428941a6646fc9f667c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 1 Jun 2009 09:34:57 -0700 Subject: 0.14.91+jenner2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6784a3b..b7f69df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg (0.14.91+jenner2) unstable; urgency=low + + * Remove special case for interfaces ... /ip + + -- Stephen Hemminger Mon, 01 Jun 2009 09:34:56 -0700 + vyatta-cfg (0.14.91+jenner1) unstable; urgency=low * UNRELEASED -- cgit v1.2.3 From 2c22465441bbb7bdd40bf7a12bbdeb8390e32471 Mon Sep 17 00:00:00 2001 From: slioch Date: Mon, 1 Jun 2009 11:55:47 -0700 Subject: fix for bug 4451. preserve empty values on leaf nodes. --- src/common/unionfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- cgit v1.2.3