diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2017-10-19 18:02:45 -0700 |
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2017-10-20 18:53:25 -0700 |
| commit | 0012cfec07315cfa843fbafc3342ead5f3d4ba2c (patch) | |
| tree | bbe1e631bccecf42254aecfa0ff86e91e041e77e | |
| parent | 5fc075bf77a295d08700bcbd305878240ae5b8b9 (diff) | |
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>
Conflicts:
redhat/daemons
| -rw-r--r-- | redhat/daemons | 2 | ||||
| -rw-r--r-- | redhat/frr.spec.in | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/redhat/daemons b/redhat/daemons index 8d12a1f5b8..c28414f0ea 100644 --- 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=("-b_" "-r/etc/init.d/frr_restart_%s" "-s/etc/init.d/frr_start_%s" "-k/etc/init.d/frr_stop_%s") +watchfrr_options=("-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 ea8a312364..76c231cbc1 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -333,6 +333,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 @@ -557,10 +559,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/* |