From 1b847cc653b9e19696bac6653a94c3d52ca7ca1f Mon Sep 17 00:00:00 2001
From: Martin Winter <mwinter@opensourcerouting.org>
Date: Wed, 28 Feb 2018 07:28:38 -0800
Subject: [PATCH] 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>
---
 debianpkg/frr.install | 1 +
 redhat/frr.spec.in    | 1 +
 tools/frr-reload      | 7 +++++++
 tools/frr.service     | 2 +-
 tools/subdir.am       | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100755 tools/frr-reload

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index 2d86009dba..f5b411c75a 100644
--- a/debianpkg/frr.install
+++ b/debianpkg/frr.install
@@ -19,4 +19,5 @@ usr/share/man/man8/frr-args.8
 usr/share/snmp/mibs/
 tools/etc/* etc/
 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 20b96bb76f..16858e1861 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -570,6 +570,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
index 0000000000..75b31d0622
--- /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 4301ec9dc7..8800bf6b0f 100644
--- 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 79aea179a9..8090d0145f 100644
--- 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 \
-- 
2.39.5