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 a2afdf083985c515157e6bb3a030c6b478a90cb0..8a9047ac9b6de16df090977f37124e53a5f307c8 100644 (file)
--- 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>