proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-18 10:43:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12252 from opensourcerouting/fix/frr-reload.py_reuse_non_default_dirs

Browse Source 
tools: Honor sysdir, confdir, bindir for frr-reload.py from "frr" wrapper
This commit is contained in:
Donald Sharp 2022-11-04 11:58:37 -04:00 committed by GitHub
commit 295a6489c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/frr.in
View File

@ -582,7 +582,7 @@ case "$1" in
NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}" NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}"
[ ! -r $NEW_CONFIG_FILE ] && echo "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1 [ ! -r $NEW_CONFIG_FILE ] && echo "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1
echo "Applying only incremental changes to running configuration from frr.conf" echo "Applying only incremental changes to running configuration from frr.conf"
"$RELOAD_SCRIPT" --reload $C_PATH/frr.conf "$RELOAD_SCRIPT" --reload --bindir "$D_PATH" --confdir "$C_PATH" --rundir "$V_PATH" "$C_PATH/frr.conf"
exit $? exit $?
;; ;;

2
tools/frrinit.sh.in
View File

@ -122,7 +122,7 @@ reload)
NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}" NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}"
[ ! -r $NEW_CONFIG_FILE ] && log_failure_msg "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1 [ ! -r $NEW_CONFIG_FILE ] && log_failure_msg "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1
"$RELOAD_SCRIPT" --reload "$NEW_CONFIG_FILE" `echo $nsopt` "$RELOAD_SCRIPT" --reload --bindir "$D_PATH" --confdir "$C_PATH" --rundir "$V_PATH" "$NEW_CONFIG_FILE" `echo $nsopt`
exit $? exit $?
;; ;;