From 6f47ecebb55910d11a84a077f349c8257aba444d Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 20 Oct 2017 14:06:05 -0700 Subject: [PATCH] redhat: Add fix to correct watchfrr config during upgrade - /etc/frr/daemon is a config file and won't be replaced, do quick sed fix - Updated changelog Signed-off-by: Martin Winter --- redhat/frr.spec.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 6a4e45a98b..26f0a980d0 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -390,6 +390,10 @@ done /sbin/chkconfig --add frr %endif +# Fix bad path in previous config files +# 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 + /sbin/install-info %{_infodir}/frr.info.gz %{_infodir}/dir # Create dummy files if they don't exist so basic functions can be used. @@ -561,7 +565,10 @@ rm -rf %{buildroot} %endif %changelog -* Mon Jun 5 2017 Martin Winter - %{version} +* Fri Oct 20 2017 Martin Winter - %{version} +- Fix script location for watchfrr restart functions in daemon config + +* Mon Jun 5 2017 Martin Winter - added NHRP daemon * Mon Apr 17 2017 Martin Winter -- 2.39.5