tools: Add helper frr-reload shell script for clean error

Adding the shell script allows a clean error if frr-pythontools
is not installed.

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index 8d12662702e05a671bb089b5d0035e3dcf40c218..20a58bb0e91619d0290fd307d8d4db3e3b510459 100644 (file)
--- a/debianpkg/frr.install
+++ b/debianpkg/frr.install
@@ -7,5 +7,6 @@ tools/frr usr/lib/frr
 usr/share/doc/frr/
 usr/share/snmp/mibs/
 tools/etc/* etc/
-tools/*.service  lib/systemd/system
-debian/frr.conf  usr/lib/tmpfiles.d
+tools/*.service lib/systemd/system
+tools/frr-reload usr/lib/frr/
+debian/frr.conf usr/lib/tmpfiles.d

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index b4073f94f32215c53559576e46ad17677109668a..ba46206695b3ee06fc31c3bf491a69dbfdcd5607 100644 (file)
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -572,6 +572,7 @@ rm -rf %{buildroot}
 %endif
 %config(noreplace) /etc/pam.d/frr
 %config(noreplace) %attr(640,root,root) /etc/logrotate.d/*
+%{_sbindir}/frr-reload
 
 %files contrib
 %defattr(-,root,root)

diff --git a/tools/frr-reload b/tools/frr-reload
new file mode 100755 (executable)
index 0000000..75b31d0
--- /dev/null
+++ b/tools/frr-reload
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if test -e /usr/lib/frr/frr-reload.py; then
+   exec /usr/lib/frr/frr-reload.py --reload /etc/frr/frr.conf
+fi
+>&2 echo "Please install frr-pythontools package. Required for reload"
+exit 1

diff --git a/tools/frr.service b/tools/frr.service
index 4301ec9dc78c4908f821340eccf280deee851270..8800bf6b0ff83960a7ad28b53b74c94c679226ee 100644 (file)
--- a/tools/frr.service
+++ b/tools/frr.service
@@ -17,6 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/frr/frr start
 ExecStop=/usr/lib/frr/frr stop
-ExecReload=/usr/lib/frr/frr-reload.py --reload /etc/frr/frr.conf
+ExecReload=/usr/lib/frr/frr-reload
 [Install]
 WantedBy=network-online.target

diff --git a/tools/subdir.am b/tools/subdir.am
index 79aea179a9a54ffcc3283046adf6c7d500b72bc1..602822e5897824536951737a1601bbc055c47e78 100644 (file)
--- a/tools/subdir.am
+++ b/tools/subdir.am
@@ -5,6 +5,7 @@
 noinst_PROGRAMS += tools/permutations
 sbin_PROGRAMS += tools/ssd
 sbin_SCRIPTS += \
+       tools/frr-reload \
        tools/frr-reload.py \
        tools/frr \
        # end
@@ -17,6 +18,7 @@ tools_ssd_SOURCES = tools/start-stop-daemon.c
 EXTRA_DIST += \
        tools/etc \
        tools/frr \
+       tools/frr-reload \
        tools/frr-reload.py \
        tools/frr.service \
        tools/multiple-bgpd.sh \