Update NetworkManager calls in suspend/resume scripts.

Revise the NetworkManager calls in the Linux network script to
prefer using the Sleep method over the "Enable" method being used
to work around a bug in version 0.9.0.

Pull request: https://github.com/vmware/open-vm-tools/pull/699
Issue: https://github.com/vmware/open-vm-tools/issues/426

diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
index 98c86fd6ce5fea8d359765bc761c315d0fbfbaa5..a744081a9fc9b9d9c10aa960e56fafa6dae8e152 100644 (file)
--- a/open-vm-tools/AUTHORS
+++ b/open-vm-tools/AUTHORS
@@ -94,3 +94,7 @@ Jan Engelhardt  Fix build problems with grpc (at least) 1.54
 
 Yun Zheng Hu    Power Ops: Attempt to execute file path only
                 - https://github.com/vmware/open-vm-tools/pull/689
+
+Joseph Allen    Updated NetworkManager calls in suspend/resume scripts
+                https://github.com/vmware/open-vm-tools/pull/699
+

diff --git a/open-vm-tools/scripts/linux/network b/open-vm-tools/scripts/linux/network
index b8cb92ce30c1b5129b24ee2e52c3e331ce7805fb..a293e1d10273edf7be957daa2479e3ecaf32011e 100644 (file)
--- a/open-vm-tools/scripts/linux/network
+++ b/open-vm-tools/scripts/linux/network
@@ -561,20 +561,21 @@ TranquilizeNetworkManager()
          ;;
    esac
 
-   # NetworkManager 0.8.0 and above
+   # NetworkManager 0.9.1 and above + earlier versions that honor
+   # the "Sleep" config boolean.
    $dbusSend --system --print-reply          \
       --dest=org.freedesktop.NetworkManager  \
       /org/freedesktop/NetworkManager        \
-      org.freedesktop.NetworkManager.Enable boolean:false
+      org.freedesktop.NetworkManager.Sleep boolean:true
    rc=$?
    if [ $rc -eq 0 ]; then
       return $rc
    fi
-   # NetworkManager 0.7.0
+   # NetworkManager 0.9.0
    $dbusSend --system --print-reply          \
       --dest=org.freedesktop.NetworkManager  \
       /org/freedesktop/NetworkManager        \
-      org.freedesktop.NetworkManager.Sleep boolean:true
+      org.freedesktop.NetworkManager.Enable boolean:false
    rc=$?
    if [ $rc -eq 0 ]; then
       return $rc
@@ -610,20 +611,21 @@ WakeNetworkManager()
    dbusSend=`which dbus-send 2>/dev/null`
    rc=$?
    if [ $rc = 0 ]; then
-      # NetworkManager 0.8.0
+      # NetworkManager 0.9.1 and above + earlier versions that honor
+      # the "Sleep" config boolean.
       $dbusSend --system --print-reply          \
          --dest=org.freedesktop.NetworkManager  \
          /org/freedesktop/NetworkManager        \
-         org.freedesktop.NetworkManager.Enable boolean:true
+         org.freedesktop.NetworkManager.Sleep boolean:false
       rc=$?
       if [ $rc = 0 ]; then
          return $rc
       fi
-      # NetworkManager 0.7.0
+      # NetworkManager 0.9.0
       $dbusSend --system --print-reply          \
          --dest=org.freedesktop.NetworkManager  \
          /org/freedesktop/NetworkManager        \
-         org.freedesktop.NetworkManager.Sleep boolean:false
+         org.freedesktop.NetworkManager.Enable boolean:true
       rc=$?
       if [ $rc = 0 ]; then
          return $rc