diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2017-10-21 01:33:39 +0200 |
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2017-10-21 03:56:04 +0200 |
| commit | c88ca85d399d3521f9a29a69e18e64272bf634f4 (patch) | |
| tree | 62700ec06b2f2108e9d87f857704e00eb6d96cce /redhat | |
| parent | redhat: Add fix to correct watchfrr config during upgrade (diff) | |
| download | frr-c88ca85d399d3521f9a29a69e18e64272bf634f4.tar.xz frr-c88ca85d399d3521f9a29a69e18e64272bf634f4.zip | |
redhat: Fix rpm scripts to correctly restart daemons on upgrade
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/frr.spec.in | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 8a9047ac9..4e05f7828 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -469,7 +469,7 @@ if [ "$1" -ge 1 ]; then ## ## Systemd Version ## - %systemd_postun frr.service + %systemd_postun_with_restart frr.service %else ## ## init.d Version @@ -484,18 +484,14 @@ fi ## ## Systemd Version ## - if [ "$1" = "0" ]; then - for daemon in %all_daemons ; do - if [ x"${daemon}" != x"" ] ; then - %systemd_preun frr.service - fi - done + if [ $1 -eq 0 ] ; then + %systemd_preun frr.service fi %else ## ## init.d Version ## - if [ "$1" = "0" ]; then + if [ $1 -eq 0 ] ; then /etc/rc.d/init.d/frr stop >/dev/null 2>&1 /sbin/chkconfig --del frr fi @@ -605,6 +601,7 @@ rm -rf %{buildroot} %changelog * 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 * Mon Jun 5 2017 Martin Winter <mwinter@opensourcerouting.org> - added NHRP and EIGRP daemon |