From: Martin Winter <mwinter@opensourcerouting.org>
Date: Fri, 20 Oct 2017 21:06:05 +0000 (-0700)
Subject: redhat: Add fix to correct watchfrr config during upgrade
X-Git-Tag: frr-4.0-dev~198^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=75429e11b9f7810084228ec425f69e99edbfce59;p=mirror%2Ffrr.git

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 <mwinter@opensourcerouting.org>

Conflicts:
	redhat/frr.spec.in
---

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index a2afdf0839..8a9047ac9b 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -417,6 +417,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.
@@ -599,7 +603,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Mon Jun  5 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+* Fri Oct 20 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+- Fix script location for watchfrr restart functions in daemon config
+
+* Mon Jun  5 2017 Martin Winter <mwinter@opensourcerouting.org>
 - added NHRP and EIGRP daemon
 
 * Mon Apr 17 2017 Martin Winter <mwinter@opensourcerouting.org>