From efe9529821f0a51b35486b86a95fe1145481e29b Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 3 Nov 2022 20:13:24 +0200 Subject: [PATCH] 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 --- tools/frr.in | 2 +- tools/frrinit.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/frr.in b/tools/frr.in index e9f1122834..1ffdade54f 100755 --- a/tools/frr.in +++ b/tools/frr.in @@ -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 $? ;; diff --git a/tools/frrinit.sh.in b/tools/frrinit.sh.in index ee10b89e52..2396b1a326 100644 --- a/tools/frrinit.sh.in +++ b/tools/frrinit.sh.in @@ -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 $? ;; -- 2.39.5