diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2018-06-01 01:20:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 01:20:26 +0200 |
| commit | a7361d4fe9ec1c7d156960a4f1acf5163e4f8114 (patch) | |
| tree | a8ae61af27479398b4fd90fdabad2408eb273bfc | |
| parent | 954b112276a61c985ca206b41e79a838e8f4fe51 (diff) | |
| parent | 5b7077e8921190c3031b2466ccb1abc468188c1e (diff) | |
Merge pull request #2250 from donaldsharp/watchfrr
redhat: Make watchfrr the default
| -rw-r--r-- | redhat/daemons | 2 | ||||
| -rw-r--r-- | redhat/frr.spec.in | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/redhat/daemons b/redhat/daemons index 1dd7c95d23..b674d738b8 100644 --- a/redhat/daemons +++ b/redhat/daemons @@ -34,7 +34,7 @@ # When using "vtysh" such a config file is also needed. It should be owned by # group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too. # -watchfrr_enable=no +watchfrr_enable=yes 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 diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index b3e7e31aaa..c6cc10542b 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -448,6 +448,12 @@ done # Config files won't get replaced by default, so we do this ugly hack to fix it %__sed -i 's|/etc/init.d/|%{_sbindir}/|g' %{_sysconfdir}/daemons 2> /dev/null || true +# With systemd, watchfrr is mandatory. Fix config to make sure it's enabled if +# we install or upgrade to a frr built with systemd +%if "%{initsystem}" == "systemd" + %__sed -i 's|watchfrr_enable=no|watchfrr_enable=yes|g' %{_sysconfdir}/daemons 2> /dev/null || true +%endif + /sbin/install-info %{_infodir}/frr.info.gz %{_infodir}/dir # Create dummy files if they don't exist so basic functions can be used. |