tools: Set correct directory of vtysh for frr-reload.py

Before it was setting SDIR, which is /usr/lib/frr, but the vtysh binary is put
under bindir (which is /usr/local by default). And running `/usr/lib/frr/frr reload`
failed.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit c9bdc0c79e0c2a27af94349eb5010175205ee7fb)

diff --git a/configure.ac b/configure.ac
index 1886635e0f850f7115fc213f07eae8c8afd66240..488e799e39cb1a04f1d3016117969c24e8637dd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2677,6 +2677,7 @@ AC_SUBST([vtysh_bin])
 
 CFG_SYSCONF="$sysconfdir"
 CFG_SBIN="$sbindir"
+CFG_BIN="$bindir"
 CFG_STATE="$frr_statedir"
 CFG_MODULE="$moduledir"
 CFG_YANGMODELS="$yangmodelsdir"
@@ -2684,6 +2685,7 @@ CFG_SCRIPT="$scriptdir"
 for I in 1 2 3 4 5 6 7 8 9 10; do
        eval CFG_SYSCONF="\"$CFG_SYSCONF\""
        eval CFG_SBIN="\"$CFG_SBIN\""
+       eval CFG_BIN="\"$CFG_BIN\""
        eval CFG_STATE="\"$CFG_STATE\""
        eval CFG_MODULE="\"$CFG_MODULE\""
        eval CFG_YANGMODELS="\"$CFG_YANGMODELS\""
@@ -2691,6 +2693,7 @@ for I in 1 2 3 4 5 6 7 8 9 10; do
 done
 AC_SUBST([CFG_SYSCONF])
 AC_SUBST([CFG_SBIN])
+AC_SUBST([CFG_BIN])
 AC_SUBST([CFG_STATE])
 AC_SUBST([CFG_MODULE])
 AC_SUBST([CFG_SCRIPT])

diff --git a/tools/frr.in b/tools/frr.in
index 1ffdade54f21126891adc9721868a9f8c311b064..2b7b7b8f09b1e208d9b2f90ba1dc0ce5f22834de 100755 (executable)
--- a/tools/frr.in
+++ b/tools/frr.in
@@ -17,6 +17,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 D_PATH="@CFG_SBIN@" # /usr/lib/frr
 C_PATH="@CFG_SYSCONF@" # /etc/frr
 V_PATH="@CFG_STATE@" # /var/run/frr
+B_PATH="@CFG_BIN@"
 VTYSH="@vtysh_bin@" # /usr/bin/vtysh
 FRR_USER="@enable_user@" # frr
 FRR_GROUP="@enable_group@" # frr
@@ -582,7 +583,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 --bindir "$D_PATH" --confdir "$C_PATH" --rundir "$V_PATH" "$C_PATH/frr.conf"
+               "$RELOAD_SCRIPT" --reload --bindir "$B_PATH" --confdir "$C_PATH" --rundir "$V_PATH" "$C_PATH/frr.conf"
                exit $?
                ;;
 

diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
index f1db3a73d528dd90624c251f1ed28ab8e8c5cb27..b96ecd0f068ccb1029388dc403f29e03f6b54ad0 100755 (executable)
--- a/tools/frrcommon.sh.in
+++ b/tools/frrcommon.sh.in
@@ -24,6 +24,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 D_PATH="@CFG_SBIN@" # /usr/lib/frr
 C_PATH="@CFG_SYSCONF@${suffix}" # /etc/frr
 V_PATH="@CFG_STATE@${suffix}" # /var/run/frr
+B_PATH="@CFG_BIN@"
 VTYSH="@vtysh_bin@" # /usr/bin/vtysh
 FRR_USER="@enable_user@" # frr
 FRR_GROUP="@enable_group@" # frr

diff --git a/tools/frrinit.sh.in b/tools/frrinit.sh.in
index 2396b1a3260f2a443edc5e9d9d2d1adfec9308f0..42adefb9eae1b90d89933c8342b2de7d9fcf81c1 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 --bindir "$D_PATH" --confdir "$C_PATH" --rundir "$V_PATH" "$NEW_CONFIG_FILE" `echo $nsopt`
+       "$RELOAD_SCRIPT" --reload --bindir "$B_PATH" --confdir "$C_PATH" --rundir "$V_PATH" "$NEW_CONFIG_FILE" `echo $nsopt`
        exit $?
        ;;