diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2017-10-20 18:19:36 -0700 |
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2017-10-20 18:48:35 -0700 |
| commit | d8d2a81ff3e8df03847a995597275f546b66f872 (patch) | |
| tree | 66c63b44212a2b87345e7a30ad6f98c3c8498039 | |
| parent | 456e5fa2c91bb4c7520459263cb58818249de5c5 (diff) | |
redhat: Add posttrans scriptlet as a temp fix for missing restart during upgrade
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
| -rw-r--r-- | redhat/frr.spec.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 013dfb81c3..8d82d2df1f 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -421,7 +421,7 @@ if [ ! -e %{_sysconfdir}/vtysh.conf ]; then fi %postun -if [ "$1" -ge 1 ]; then +if [ $1 -ge 1 ]; then # # Upgrade from older version # @@ -458,6 +458,17 @@ fi %endif /sbin/install-info --delete %{_infodir}/frr.info.gz %{_infodir}/dir +%posttrans +# We screwed up and didn't correctly add the restart to the RPM script +# with the previous version. postun script is run from the previous version, +# so the fix won't work until the next time. +# We add an additional restart here which should be removed in future +# major versions +%if "%{initsystem}" == "systemd" + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart frr.service >/dev/null 2>&1 || : +%endif + %clean %if !0%{?keep_build:1} rm -rf %{buildroot} @@ -548,6 +559,8 @@ rm -rf %{buildroot} * Fri Oct 20 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version} - Fix script location for watchfrr restart functions in daemon config - Fix postun script to restart frr during upgrade +- Add posttrans script to fix missing restart in postun script from 2.0 rpm + package. Will be removed in next major version > 3 again * Mon Apr 17 2017 Martin Winter <mwinter@opensourcerouting.org> - new subpackage frr-pythontools with python 2.7 restart script |