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>

diff --git a/tools/frr.in b/tools/frr.in
index e9f112283483ee44646a25bd54df932c37d4a28a..1ffdade54f21126891adc9721868a9f8c311b064 100755 (executable)
--- 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 ee10b89e52abc6559012dfebb490ac38f7704018..2396b1a3260f2a443edc5e9d9d2d1adfec9308f0 100644 (file)
--- 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 $?
        ;;