mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-06 10:54:47 +00:00
tools: Honor sysdir, confdir, bindir for frr-reload.py from "frr" wrapper
Without this, those variables are not passed to frr-reload.py and uses default values. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
parent
d7cde18c63
commit
efe9529821
@ -582,7 +582,7 @@ case "$1" in
|
||||
NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}"
|
||||
[ ! -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"
|
||||
"$RELOAD_SCRIPT" --reload $C_PATH/frr.conf
|
||||
"$RELOAD_SCRIPT" --reload --bindir "$D_PATH" --confdir "$C_PATH" --rundir "$V_PATH" "$C_PATH/frr.conf"
|
||||
exit $?
|
||||
;;
|
||||
|
||||
|
@ -122,7 +122,7 @@ reload)
|
||||
|
||||
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
|
||||
"$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 $?
|
||||
;;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user