Skip to content

Commit 9026382

Browse files
author
Kruti
committed
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: #699 Issue: #426
1 parent 7617767 commit 9026382

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

open-vm-tools/AUTHORS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,7 @@ Jan Engelhardt Fix build problems with grpc (at least) 1.54
9494

9595
Yun Zheng Hu Power Ops: Attempt to execute file path only
9696
- https://github.com/vmware/open-vm-tools/pull/689
97+
98+
Joseph Allen Updated NetworkManager calls in suspend/resume scripts
99+
https://github.com/vmware/open-vm-tools/pull/699
100+

open-vm-tools/scripts/linux/network

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -561,20 +561,21 @@ TranquilizeNetworkManager()
561561
;;
562562
esac
563563

564-
# NetworkManager 0.8.0 and above
564+
# NetworkManager 0.9.1 and above + earlier versions that honor
565+
# the "Sleep" config boolean.
565566
$dbusSend --system --print-reply \
566567
--dest=org.freedesktop.NetworkManager \
567568
/org/freedesktop/NetworkManager \
568-
org.freedesktop.NetworkManager.Enable boolean:false
569+
org.freedesktop.NetworkManager.Sleep boolean:true
569570
rc=$?
570571
if [ $rc -eq 0 ]; then
571572
return $rc
572573
fi
573-
# NetworkManager 0.7.0
574+
# NetworkManager 0.9.0
574575
$dbusSend --system --print-reply \
575576
--dest=org.freedesktop.NetworkManager \
576577
/org/freedesktop/NetworkManager \
577-
org.freedesktop.NetworkManager.Sleep boolean:true
578+
org.freedesktop.NetworkManager.Enable boolean:false
578579
rc=$?
579580
if [ $rc -eq 0 ]; then
580581
return $rc
@@ -610,20 +611,21 @@ WakeNetworkManager()
610611
dbusSend=`which dbus-send 2>/dev/null`
611612
rc=$?
612613
if [ $rc = 0 ]; then
613-
# NetworkManager 0.8.0
614+
# NetworkManager 0.9.1 and above + earlier versions that honor
615+
# the "Sleep" config boolean.
614616
$dbusSend --system --print-reply \
615617
--dest=org.freedesktop.NetworkManager \
616618
/org/freedesktop/NetworkManager \
617-
org.freedesktop.NetworkManager.Enable boolean:true
619+
org.freedesktop.NetworkManager.Sleep boolean:false
618620
rc=$?
619621
if [ $rc = 0 ]; then
620622
return $rc
621623
fi
622-
# NetworkManager 0.7.0
624+
# NetworkManager 0.9.0
623625
$dbusSend --system --print-reply \
624626
--dest=org.freedesktop.NetworkManager \
625627
/org/freedesktop/NetworkManager \
626-
org.freedesktop.NetworkManager.Sleep boolean:false
628+
org.freedesktop.NetworkManager.Enable boolean:true
627629
rc=$?
628630
if [ $rc = 0 ]; then
629631
return $rc

0 commit comments

Comments
 (0)