matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

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

Browse source 
* 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
This commit is contained in:
Martin Winter 2017-10-19 18:02:45 -07:00
parent 5fc075bf77
commit 0012cfec07
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
redhat/daemons
View file

@ -35,7 +35,7 @@
# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too. # group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
# #
watchfrr_enable=no 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 zebra=no
bgpd=no bgpd=no

7
redhat/frr.spec.in
View file

@ -333,6 +333,8 @@ install %{zeb_rh_src}/frr.init \
%else %else
mkdir -p %{buildroot}/etc/rc.d/init.d mkdir -p %{buildroot}/etc/rc.d/init.d
install %{zeb_rh_src}/frr.init \ install %{zeb_rh_src}/frr.init \
%{buildroot}%{_sbindir}/frr
ln -s %{_sbindir}/frr \
%{buildroot}/etc/rc.d/init.d/frr %{buildroot}/etc/rc.d/init.d/frr
%endif %endif
@ -557,10 +559,11 @@ rm -rf %{buildroot}
%config(noreplace) /etc/frr/[!v]*.conf* %config(noreplace) /etc/frr/[!v]*.conf*
%config(noreplace) %attr(750,%frr_user,%frr_user) /etc/frr/daemons %config(noreplace) %attr(750,%frr_user,%frr_user) /etc/frr/daemons
%if "%{initsystem}" == "systemd" %if "%{initsystem}" == "systemd"
%config %{_unitdir}/frr.service %{_unitdir}/frr.service
%{_sbindir}/frr %{_sbindir}/frr
%else %else
%config /etc/rc.d/init.d/frr /etc/rc.d/init.d/frr
%{_sbindir}/frr
%endif %endif
%config(noreplace) /etc/pam.d/frr %config(noreplace) /etc/pam.d/frr
%config(noreplace) %attr(640,root,root) /etc/logrotate.d/* %config(noreplace) %attr(640,root,root) /etc/logrotate.d/*