redhat: Always reference main frr start/stop script in /usr/lib/frr

* Fixes issue where daemon default config tried to use /etc/init.d/frr script which doesn't exist on systemd systems

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

diff --git a/redhat/daemons b/redhat/daemons
index 689ad9baaa04949a3246191a3648a05cba5c6985..eeecb4c12b51ff31b43ec790b175299efcf3039b 100644 (file)
--- a/redhat/daemons
+++ b/redhat/daemons
@@ -35,7 +35,7 @@
 # group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
 #
 watchfrr_enable=no
-watchfrr_options=("-Az" "-b_" "-r/etc/init.d/frr_restart_%s" "-s/etc/init.d/frr_start_%s" "-k/etc/init.d/frr_stop_%s")
+watchfrr_options=("-Az" "-b_" "-r/usr/lib/frr/frr_restart_%s" "-s/usr/lib/frr/frr_start_%s" "-k/usr/lib/frr/frr_stop_%s")
 #
 zebra=no
 bgpd=no

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 8c555a3c421f0919f4fe7675abd0ec6a8d607329..ffb0ff7f781d0c54576aabcb5f510a84d6f93a18 100644 (file)
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -302,6 +302,8 @@ install %{zeb_rh_src}/frr.init \
 %else
 mkdir -p %{buildroot}/etc/rc.d/init.d
 install %{zeb_rh_src}/frr.init \
+    %{buildroot}%{_sbindir}/frr
+ln -s %{_sbindir}/frr \
     %{buildroot}/etc/rc.d/init.d/frr
 %endif
 
@@ -507,10 +509,11 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/frr/[!v]*.conf*
 %config(noreplace) %attr(750,%frr_user,%frr_user) /etc/frr/daemons
 %if "%{initsystem}" == "systemd"
-    %config %{_unitdir}/frr.service
+    %{_unitdir}/frr.service
     %{_sbindir}/frr
 %else
-    %config /etc/rc.d/init.d/frr
+    /etc/rc.d/init.d/frr
+    %{_sbindir}/frr
 %endif
 %config(noreplace) /etc/pam.d/frr
 %config(noreplace) %attr(640,root,root) /etc/logrotate.d/*