diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/frr-reload.py | 6 | ||||
| -rw-r--r-- | tools/frrcommon.sh.in | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 0b2397070..3121551ee 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -1320,6 +1320,12 @@ def compare_context_objects(newconf, running): ): continue + # same thing for a pseudowire sub-context inside an l2vpn context + elif (len(running_ctx_keys) > 1 and running_ctx_keys[0].startswith('l2vpn') and + running_ctx_keys[1].startswith('member pseudowire') and + (running_ctx_keys[:1], None) in lines_to_del): + continue + # Non-global context elif running_ctx_keys and not any( "address-family" in key for key in running_ctx_keys diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 312ee88bf..3dbc6a1b4 100644 --- a/tools/frrcommon.sh.in +++ b/tools/frrcommon.sh.in @@ -59,6 +59,9 @@ chownfrr() { [ -n "$FRR_USER" ] && chown "$FRR_USER" "$1" [ -n "$FRR_GROUP" ] && chgrp "$FRR_GROUP" "$1" [ -n "$FRR_CONFIG_MODE" ] && chmod "$FRR_CONFIG_MODE" "$1" + if [ -d "$1" ]; then + chmod u+x "$1" + fi } vtysh_b () { |