summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavio Leitner <fbl@redhat.com>2016-10-18 15:04:42 -0200
committerRussell Bryant <russell@ovn.org>2016-10-20 12:47:16 -0400
commit5771f476573445710834234a6a9f7bd999a027e7 (patch)
treec18476a07e391727d847c6311281b990d4f3bc7d
parent9f13fbef372e03ff0ab5ca69b42cd3379fb81987 (diff)
downloadopenvswitch-5771f476573445710834234a6a9f7bd999a027e7.tar.gz
fedora: do not restart the service on a pkg upgrade
There is no reliable way to restore the previous networking state after a service restart. Many things like firewall configuration, traffic shaping, stacked devices, custom setups are completely out of OVS control. The OVS might be providing the network used for remote administration, so do not automatically restart the service during a package upgrade. Signed-off-by: Flavio Leitner <fbl@redhat.com> Signed-off-by: Russell Bryant <russell@ovn.org>
-rw-r--r--NEWS2
-rw-r--r--rhel/openvswitch-fedora.spec.in8
2 files changed, 4 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 9b6fa35ae..d07ec4593 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,8 @@ Post-v2.6.0
- DPDK:
* New option 'n_rxq_desc' and 'n_txq_desc' fields for DPDK interfaces
which set the number of rx and tx descriptors to use for the given port.
+ - Fedora packaging:
+ * A package upgrade does not automatically restart OVS service.
v2.6.0 - 27 Sep 2016
---------------------
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 25aae00d3..394ea2110 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -344,14 +344,10 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/semodule -i %{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp &> /dev/null || :
%postun
-%if 0%{?systemd_postun_with_restart:1}
- %systemd_postun_with_restart %{name}.service
+%if 0%{?systemd_postun:1}
+ %systemd_postun %{name}.service
%else
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
- if [ "$1" -ge "1" ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
- fi
%endif
%postun ovn-central