diff options
| -rw-r--r-- | debian/changelog | 37 | ||||
| -rwxr-xr-x | lib/Vyatta/ConfigLoad.pm | 4 | ||||
| -rw-r--r-- | src/commit2.c | 22 | ||||
| -rw-r--r-- | src/common/defs.h | 2 | ||||
| -rw-r--r-- | templates/priority | 2 |
5 files changed, 58 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index d230697..17fd940 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,40 @@ +vyatta-cfg (0.14.54) unstable; urgency=low + + [ slioch ] + * added noop state to commit_action env variable to make scripts + happy. + * change noop to active for env variable--this is more consistent with + the action being applied. + + [ An-Cheng Huang ] + * make bridge address a different rank to match new priority scheme. + + -- An-Cheng Huang <ancheng@vyatta.com> Tue, 31 Mar 2009 14:57:12 -0700 + +vyatta-cfg (0.14.53) unstable; urgency=low + + [ slioch ] + * only set env varible for commit action on directly deleted set nodes + and do not promote to enclosing transaction scope. + + [ Stig Thormodsrud ] + * Remove duplicate priorities for ethernet/vif. + + -- Stig Thormodsrud <stig@vyatta.com> Mon, 30 Mar 2009 14:21:08 -0700 + +vyatta-cfg (0.14.52) unstable; urgency=low + + [ slioch ] + * propagate commit failure error to commit return status. + + -- An-Cheng Huang <ancheng@vyatta.com> Mon, 30 Mar 2009 11:24:36 -0700 + +vyatta-cfg (0.14.51) unstable; urgency=low + + * Add all the new ip/ipv6 ospf/rip parameters + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Sat, 28 Mar 2009 17:45:13 -0700 + vyatta-cfg (0.14.50) unstable; urgency=low [ Bob Gilligan ] diff --git a/lib/Vyatta/ConfigLoad.pm b/lib/Vyatta/ConfigLoad.pm index 9186ce5..a054314 100755 --- a/lib/Vyatta/ConfigLoad.pm +++ b/lib/Vyatta/ConfigLoad.pm @@ -37,10 +37,11 @@ my %config_rank = ( 'system host-name' => 1070, 'protocols ospf parameters' => 1060, 'protocols ospf' => 1055, + 'protocols rip interface' => 905, 'protocols rip' => 1050, 'interfaces' => 1000, + 'interfaces bonding' => 995, 'interfaces bridge' => 990, - 'interfaces bonding' => 995, 'interfaces ethernet' => 980, 'interfaces tunnel' => 910, 'system gateway-address' => 890, @@ -62,6 +63,7 @@ my %regex_rank = ( 'protocols bgp \d+ parameters' => 810, 'protocols bgp \d+ neighbor \d+\.\d+\.\d+\.\d+' => 800, 'protocols bgp \d+ neighbor \w+' => 801, + 'interfaces bridge \S* address' => 920, ); my @all_nodes = (); diff --git a/src/commit2.c b/src/commit2.c index 0dc85eb..0a332d2 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -269,7 +269,8 @@ main(int argc, char** argv) if (g_debug) { printf("DONE\n"); } - exit(0); + + exit (no_errors == FALSE); } /** @@ -364,11 +365,18 @@ process_func(GNode *node, gpointer data) if (result->_action == delete_act) { set_in_delete_action(TRUE); } - if (IS_DELETE(d->_operation)) { - setenv(ENV_ACTION_NAME,ENV_ACTION_DELETE,1); + + //do not set for promoted actions + if (!IS_ACTIVE(d->_operation)) { + if (IS_DELETE(d->_operation)) { + setenv(ENV_ACTION_NAME,ENV_ACTION_DELETE,1); + } + else { + setenv(ENV_ACTION_NAME,ENV_ACTION_SET,1); + } } else { - setenv(ENV_ACTION_NAME,ENV_ACTION_SET,1); + setenv(ENV_ACTION_NAME,ENV_ACTION_ACTIVE,1); } if (g_dump_actions == FALSE) { @@ -387,6 +395,7 @@ process_func(GNode *node, gpointer data) if (result->_action == delete_act) { set_in_delete_action(FALSE); } + unsetenv(ENV_ACTION_NAME); if (g_coverage) { @@ -668,7 +677,10 @@ dump_func(GNode *node, gpointer data) if (((struct VyattaNode*)gp)->_data._name != NULL) { int i; - if (IS_DELETE(((struct VyattaNode*)gp)->_data._operation)) { + if (IS_ACTIVE(((struct VyattaNode*)gp)->_data._operation)) { + fprintf(out,"*"); + } + else if (IS_DELETE(((struct VyattaNode*)gp)->_data._operation)) { fprintf(out,"-"); } else if (IS_CREATE(((struct VyattaNode*)gp)->_data._operation)) { diff --git a/src/common/defs.h b/src/common/defs.h index a26bfbc..5e110bc 100644 --- a/src/common/defs.h +++ b/src/common/defs.h @@ -14,7 +14,7 @@ #define ENV_ACTION_NAME "COMMIT_ACTION" #define ENV_ACTION_DELETE "DELETE" #define ENV_ACTION_SET "SET" - +#define ENV_ACTION_ACTIVE "ACTIVE" struct Result { diff --git a/templates/priority b/templates/priority index 7bd7d35..d8cb01b 100644 --- a/templates/priority +++ b/templates/priority @@ -170,7 +170,6 @@ 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 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 @@ -195,7 +194,6 @@ 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 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 |