diff options
Diffstat (limited to 'community/open-vm-tools/scripts-network-FS19541.patch')
| -rw-r--r-- | community/open-vm-tools/scripts-network-FS19541.patch | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/community/open-vm-tools/scripts-network-FS19541.patch b/community/open-vm-tools/scripts-network-FS19541.patch index 1f65b9824..5fcb33ba8 100644 --- a/community/open-vm-tools/scripts-network-FS19541.patch +++ b/community/open-vm-tools/scripts-network-FS19541.patch @@ -1,5 +1,5 @@ ---- network 2010-04-28 12:30:51.000000000 +0200 -+++ network.bak 2010-05-20 12:12:50.000000000 +0200 +--- network.orig 2011-11-09 18:42:28.000000000 +0400 ++++ network 2011-11-09 18:46:22.000000000 +0400 @@ -76,7 +76,7 @@ else echo `date` "[rescue_nic] activating $nic ..." @@ -9,32 +9,30 @@ exitCode=`expr $exitCode \| $?` fi done < $activeList -@@ -103,7 +103,7 @@ - TranquilizeNetworkManager() { +@@ -105,7 +105,7 @@ # `which' may be a bit noisy, so we'll shush it. dbusSend=`which dbus-send 2>/dev/null` -- if [ $? -eq 0 ]; then -+ if [ $? -eq 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.6 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ -@@ -133,7 +133,7 @@ - WakeNetworkManager() { + rc=$? +- if [ $rc = 0 ]; then ++ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ +@@ -154,7 +154,7 @@ # `which' may be a bit noisy, so we'll shush it. dbusSend=`which dbus-send 2>/dev/null` -- if [ $? -eq 0 ]; then -+ if [ $? -eq 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.6 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ -@@ -165,8 +165,8 @@ + rc=$? +- if [ $rc = 0 ]; then ++ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ +@@ -203,7 +203,7 @@ # XXX Are these really necessary? If so, we should have seen customer # complaints by now. - which ifup >/dev/null 2>&1 || Panic "ifup not in search path." -- which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." +# which ifup >/dev/null 2>&1 || Panic "ifup not in search path." -+ which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." + which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." case "$1" in - poweron-vm) |