summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/open-vm-tools/files/default-scripts1.patch')
-rw-r--r--app-emulation/open-vm-tools/files/default-scripts1.patch163
1 files changed, 0 insertions, 163 deletions
diff --git a/app-emulation/open-vm-tools/files/default-scripts1.patch b/app-emulation/open-vm-tools/files/default-scripts1.patch
deleted file mode 100644
index d89ff907805f..000000000000
--- a/app-emulation/open-vm-tools/files/default-scripts1.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -ur scripts.orig/linux/resume-vm-default scripts/linux/resume-vm-default
---- scripts.orig/linux/resume-vm-default 2009-10-26 14:08:44.000000000 -0400
-+++ scripts/linux/resume-vm-default 2009-10-26 14:07:29.000000000 -0400
-@@ -25,37 +25,6 @@
- echo `date` ": Executing '$0'"
- echo
-
--find_networking_script() {
-- local script="error"
-- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
-- if [ -d "$dir/rc0.d" ] &&
-- [ -d "$dir/rc1.d" ] &&
-- [ -d "$dir/rc2.d" ] &&
-- [ -d "$dir/rc3.d" ] &&
-- [ -d "$dir/rc4.d" ] &&
-- [ -d "$dir/rc5.d" ] &&
-- [ -d "$dir/rc6.d" ]; then
--
-- # Now find the appropriate networking script.
-- if [ -d "$dir/init.d" ]; then
-- if [ -x "$dir/init.d/network" ]; then
-- script="$dir/init.d/network"
-- elif [ -x "$dir/init.d/networking" ]; then
-- script="$dir/init.d/networking"
-- fi
-- else
-- if [ -x "$dir/network" ]; then
-- script="$dir/network"
-- elif [ -x "$dir/networking" ]; then
-- script="$dir/networking"
-- fi
-- fi
-- fi
-- done
--
-- echo "$script"
--}
--
- save_active_NIC_list() {
- ifconfig_path=`which ifconfig 2>/dev/null`
- if [ $? ]; then
-@@ -73,7 +42,7 @@
- rescue_NIC() {
- niclist="/var/run/vmware-active-nics"
-
-- ifup_path=`which ifup 2>/dev/null`;
-+ ifup_path="/etc/init.d/net.";
- if [ $? -ne 0 ]; then
- return 1;
- fi
-@@ -90,7 +59,7 @@
- else
- echo `date` "[rescue_nic] activating $nic ..."
-
-- $ifup_path $nic
-+ $ifup_path$nic restart
- fi
- done < $niclist
-
-@@ -120,7 +89,7 @@
- # NetworkManager 0.6
- $dbusSend --system --dest=org.freedesktop.NetworkManager \
- /org/freedesktop/NetworkManager \
-- org.freedesktop.NetworkManager.wake
-+ org.freedesktop.NetworkManager.Sleep boolean:false
- # NetworkManager 0.7.0
- $dbusSend --system --dest=org.freedesktop.NetworkManager \
- /org/freedesktop/NetworkManager \
-@@ -139,15 +108,8 @@
-
- wakeNetworkManager
-
--network=`find_networking_script`
--if [ "$network" != "error" ]; then
-- "$network" restart
-- # Continue even if the networking init script wasn't successful.
-- status=0
--else
-- echo "networking script not found"
-- status=1
--fi
-+# Continue even if the networking init script wasn't successful.
-+status=0
-
- if [ $status -eq 0 ]; then
- rescue_NIC
-diff -ur scripts.orig/linux/suspend-vm-default scripts/linux/suspend-vm-default
---- scripts.orig/linux/suspend-vm-default 2009-10-26 14:08:44.000000000 -0400
-+++ scripts/linux/suspend-vm-default 2009-10-25 16:27:09.000000000 -0400
-@@ -25,37 +25,6 @@
- echo `date` ": Executing '$0'"
- echo
-
--find_networking_script() {
-- local script="error"
-- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
-- if [ -d "$dir/rc0.d" ] &&
-- [ -d "$dir/rc1.d" ] &&
-- [ -d "$dir/rc2.d" ] &&
-- [ -d "$dir/rc3.d" ] &&
-- [ -d "$dir/rc4.d" ] &&
-- [ -d "$dir/rc5.d" ] &&
-- [ -d "$dir/rc6.d" ]; then
--
-- # Now find the appropriate networking script.
-- if [ -d "$dir/init.d" ]; then
-- if [ -x "$dir/init.d/network" ]; then
-- script="$dir/init.d/network"
-- elif [ -x "$dir/init.d/networking" ]; then
-- script="$dir/init.d/networking"
-- fi
-- else
-- if [ -x "$dir/network" ]; then
-- script="$dir/network"
-- elif [ -x "$dir/networking" ]; then
-- script="$dir/networking"
-- fi
-- fi
-- fi
-- done
--
-- echo "$script"
--}
--
- save_active_NIC_list() {
- ifconfig_path=`which ifconfig 2>/dev/null`
- if [ $? ]; then
-@@ -82,11 +51,6 @@
- # `which' may be a bit noisy, so we'll shush it.
- dbusSend=`which dbus-send 2>/dev/null`
- if [ $? -eq 0 ]; then
-- # NetworkManager 0.6
-- $dbusSend --system --dest=org.freedesktop.NetworkManager \
-- /org/freedesktop/NetworkManager \
-- org.freedesktop.NetworkManager.sleep
-- # NetworkManager 0.7.0
- $dbusSend --system --dest=org.freedesktop.NetworkManager \
- /org/freedesktop/NetworkManager \
- org.freedesktop.NetworkManager.Sleep boolean:true
-@@ -107,16 +71,13 @@
-
- save_active_NIC_list
-
--network=`find_networking_script`
--if [ "$network" != "error" ]; then
-- "$network" stop
-- # If the network is down, this may fail but that's not a good reason
-- # to prevent the suspend.
-- status=0
--else
-- echo "networking script not found"
-- status=1
--fi
-+for network in `ls /etc/init.d/net.*`;
-+do
-+ "$network" stop
-+done
-+# If the network is down, this may fail but that's not a good reason
-+# to prevent the suspend.
-+status=0
-
- tranquilizeNetworkManager
-