Commit 7597424fab for frr
commit 7597424fab50ca4fd4f6bea6b159d28cca488fdf
Author: Donald Sharp <sharpd@nvidia.com>
Date: Fri Sep 25 14:21:51 2026 -0400
tools: Have frr-reload.py get defaults from configure.ac
frr-reload.py has a bunch of defaults that should be grabbed
from configure.ac. Make it so.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
diff --git a/configure.ac b/configure.ac
index 6f8084f436..86a4b76fe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2865,6 +2865,7 @@ AC_CONFIG_FILES([tools/frr], [chmod +x tools/frr])
AC_CONFIG_FILES([tools/watchfrr.sh], [chmod +x tools/watchfrr.sh])
AC_CONFIG_FILES([tools/frrinit.sh], [chmod +x tools/frrinit.sh])
AC_CONFIG_FILES([tools/frrcommon.sh])
+AC_CONFIG_FILES([tools/frr-reload.py], [chmod +x tools/frr-reload.py])
AC_CONFIG_FILES([tools/frr.service])
AC_CONFIG_FILES([tools/frr@.service])
AC_CONFIG_FILES([frr.pc], [ln -sf ../frr.pc tools/frr.pc])
diff --git a/tools/.gitignore b/tools/.gitignore
index 1cc343a11a..36a4d48b5f 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -6,6 +6,7 @@
/watchfrr.sh
/frrinit.sh
/frrcommon.sh
+/frr-reload.py
/frr.service
/frr@.service
/frr-llvm-cg
diff --git a/tools/frr-reload.py b/tools/frr-reload.py.in
similarity index 99%
rename from tools/frr-reload.py
rename to tools/frr-reload.py.in
index 5c7732c58c..93f19eabf6 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py.in
@@ -3130,13 +3130,15 @@ if __name__ == "__main__":
default=False,
)
parser.add_argument(
- "--bindir", help="path to the vtysh executable", default="/usr/bin"
+ "--bindir", help="path to the vtysh executable", default="@e_bindir@"
)
parser.add_argument(
- "--confdir", help="path to the daemon config files", default="/etc/frr"
+ "--confdir",
+ help="path to the daemon config files",
+ default="@e_frr_sysconfdir@",
)
parser.add_argument(
- "--rundir", help="path for the temp config file", default="/var/run/frr"
+ "--rundir", help="path for the temp config file", default="@e_frr_runstatedir@"
)
parser.add_argument(
"--vty_socket",
diff --git a/tools/subdir.am b/tools/subdir.am
index f55c3b1f16..f4ba3e796e 100644
--- a/tools/subdir.am
+++ b/tools/subdir.am
@@ -60,7 +60,6 @@ noinst_HEADERS += \
EXTRA_DIST += \
tools/etc \
tools/frr-reload \
- tools/frr-reload.py \
tools/frr.service \
tools/frr@.service \
tools/generate_support_bundle.py \