From 55a2ae95e713bb28c8028673d639b0eaa69ecd2e 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 Conflicts: redhat/frr.spec.in --- 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 5823c5a58..1c03efd33 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -377,6 +377,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. @@ -545,7 +549,10 @@ rm -rf %{buildroot} %endif %changelog -* Mon Apr 17 2017 Martin Winter - %{version} +* Fri Oct 20 2017 Martin Winter - %{version} +- Fix script location for watchfrr restart functions in daemon config + +* Mon Apr 17 2017 Martin Winter - new subpackage frr-pythontools with python 2.7 restart script - remove PIMd from CentOS/RedHat 6 RPM packages (won't work - too old) - converted to single frr init script (not per daemon) based on debian init script -- 2.39.2