From 4daa32f67c353031f1962dbb3b70a015321798f7 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 30 May 2018 07:53:28 -0400 Subject: [PATCH] redhat: Fix old systems on upgrade path Fix old systems in upgrade path to enable watchfrr when upgrading. Signed-off-by: Donald Sharp --- redhat/frr.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 00ef0616e8..ecf5f63dff 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -430,6 +430,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. -- 2.39.5