diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-11-04 11:58:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 11:58:37 -0400 |
| commit | 295a6489c8d06a4a3f03769624c51a299ffcddea (patch) | |
| tree | 328db5c511bd40436343bd0f3fd6a364c47dd645 | |
| parent | 94fdbad234a5eb6acf290c2dfaedcc0f46b20723 (diff) | |
| parent | efe9529821f0a51b35486b86a95fe1145481e29b (diff) | |
Merge pull request #12252 from opensourcerouting/fix/frr-reload.py_reuse_non_default_dirs
tools: Honor sysdir, confdir, bindir for frr-reload.py from "frr" wrapper
| -rwxr-xr-x | tools/frr.in | 2 | ||||
| -rw-r--r-- | 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 $? ;; |