[NetworkManager/f16] Don't restart NM on upgrade or uninstall (rh #812967)

Daniel Williams dcbw at fedoraproject.org
Mon Apr 30 22:03:32 UTC 2012


commit 4163aee3f9238725a816f4344b84fe44f23fab0e
Author: Dan Williams <dcbw at redhat.com>
Date:   Mon Apr 23 10:10:16 2012 -0500

    Don't restart NM on upgrade or uninstall (rh #812967)
    
    Prevent networking hiccups and return to Sept 2011 behavior of making
    sure networking doesn't bounce.

 NetworkManager.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 10390d2..f62ecc0 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -294,14 +294,17 @@ fi
 if [ $1 -eq 0 ]; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable NetworkManager.service >/dev/null 2>&1 || :
-    /bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
+
+    # Don't kill networking entirely just on package remove
+    #/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
 fi
 
 %postun
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
         # Package upgrade, not uninstall
-        /bin/systemctl try-restart NetworkManager.service >/dev/null 2>&1 || :
+        # Don't restart networking to prevent hiccups
+        #/bin/systemctl try-restart NetworkManager.service >/dev/null 2>&1 || :
 fi
 
 %triggerun -- NetworkManager < 1:0.8.990
@@ -466,6 +469,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libnm-gtk.so
 
 %changelog
+* Tue Apr 24 2012 Dan Williams <dcbw at redhat.com> - 0.9.4-4.git20120403
+- don't restart NM on upgrade or uninstall (rh #812967)
+
 * Thu Apr 19 2012 Dan Winship <danw at redhat.com> - 0.9.4-3.git20120403
 - Fix IPv6 connectivity problems (rh #785772)
 


More information about the scm-commits mailing list