| 1 |
vadimk 09/10/29 14:14:53 |
| 2 |
|
| 3 |
Added: default-scripts1.patch |
| 4 |
Removed: wiper-warning-fix.patch |
| 5 |
Log: |
| 6 |
version bump. ebuild split. |
| 7 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/open-vm-tools/files/default-scripts1.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/open-vm-tools/files/default-scripts1.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/open-vm-tools/files/default-scripts1.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: default-scripts1.patch |
| 16 |
=================================================================== |
| 17 |
diff -ur scripts.orig/linux/resume-vm-default scripts/linux/resume-vm-default |
| 18 |
--- scripts.orig/linux/resume-vm-default 2009-10-26 14:08:44.000000000 -0400 |
| 19 |
+++ scripts/linux/resume-vm-default 2009-10-26 14:07:29.000000000 -0400 |
| 20 |
@@ -25,37 +25,6 @@ |
| 21 |
echo `date` ": Executing '$0'" |
| 22 |
echo |
| 23 |
|
| 24 |
-find_networking_script() { |
| 25 |
- local script="error" |
| 26 |
- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do |
| 27 |
- if [ -d "$dir/rc0.d" ] && |
| 28 |
- [ -d "$dir/rc1.d" ] && |
| 29 |
- [ -d "$dir/rc2.d" ] && |
| 30 |
- [ -d "$dir/rc3.d" ] && |
| 31 |
- [ -d "$dir/rc4.d" ] && |
| 32 |
- [ -d "$dir/rc5.d" ] && |
| 33 |
- [ -d "$dir/rc6.d" ]; then |
| 34 |
- |
| 35 |
- # Now find the appropriate networking script. |
| 36 |
- if [ -d "$dir/init.d" ]; then |
| 37 |
- if [ -x "$dir/init.d/network" ]; then |
| 38 |
- script="$dir/init.d/network" |
| 39 |
- elif [ -x "$dir/init.d/networking" ]; then |
| 40 |
- script="$dir/init.d/networking" |
| 41 |
- fi |
| 42 |
- else |
| 43 |
- if [ -x "$dir/network" ]; then |
| 44 |
- script="$dir/network" |
| 45 |
- elif [ -x "$dir/networking" ]; then |
| 46 |
- script="$dir/networking" |
| 47 |
- fi |
| 48 |
- fi |
| 49 |
- fi |
| 50 |
- done |
| 51 |
- |
| 52 |
- echo "$script" |
| 53 |
-} |
| 54 |
- |
| 55 |
save_active_NIC_list() { |
| 56 |
ifconfig_path=`which ifconfig 2>/dev/null` |
| 57 |
if [ $? ]; then |
| 58 |
@@ -73,7 +42,7 @@ |
| 59 |
rescue_NIC() { |
| 60 |
niclist="/var/run/vmware-active-nics" |
| 61 |
|
| 62 |
- ifup_path=`which ifup 2>/dev/null`; |
| 63 |
+ ifup_path="/etc/init.d/net."; |
| 64 |
if [ $? -ne 0 ]; then |
| 65 |
return 1; |
| 66 |
fi |
| 67 |
@@ -90,7 +59,7 @@ |
| 68 |
else |
| 69 |
echo `date` "[rescue_nic] activating $nic ..." |
| 70 |
|
| 71 |
- $ifup_path $nic |
| 72 |
+ $ifup_path$nic restart |
| 73 |
fi |
| 74 |
done < $niclist |
| 75 |
|
| 76 |
@@ -120,7 +89,7 @@ |
| 77 |
# NetworkManager 0.6 |
| 78 |
$dbusSend --system --dest=org.freedesktop.NetworkManager \ |
| 79 |
/org/freedesktop/NetworkManager \ |
| 80 |
- org.freedesktop.NetworkManager.wake |
| 81 |
+ org.freedesktop.NetworkManager.Sleep boolean:false |
| 82 |
# NetworkManager 0.7.0 |
| 83 |
$dbusSend --system --dest=org.freedesktop.NetworkManager \ |
| 84 |
/org/freedesktop/NetworkManager \ |
| 85 |
@@ -139,15 +108,8 @@ |
| 86 |
|
| 87 |
wakeNetworkManager |
| 88 |
|
| 89 |
-network=`find_networking_script` |
| 90 |
-if [ "$network" != "error" ]; then |
| 91 |
- "$network" restart |
| 92 |
- # Continue even if the networking init script wasn't successful. |
| 93 |
- status=0 |
| 94 |
-else |
| 95 |
- echo "networking script not found" |
| 96 |
- status=1 |
| 97 |
-fi |
| 98 |
+# Continue even if the networking init script wasn't successful. |
| 99 |
+status=0 |
| 100 |
|
| 101 |
if [ $status -eq 0 ]; then |
| 102 |
rescue_NIC |
| 103 |
diff -ur scripts.orig/linux/suspend-vm-default scripts/linux/suspend-vm-default |
| 104 |
--- scripts.orig/linux/suspend-vm-default 2009-10-26 14:08:44.000000000 -0400 |
| 105 |
+++ scripts/linux/suspend-vm-default 2009-10-25 16:27:09.000000000 -0400 |
| 106 |
@@ -25,37 +25,6 @@ |
| 107 |
echo `date` ": Executing '$0'" |
| 108 |
echo |
| 109 |
|
| 110 |
-find_networking_script() { |
| 111 |
- local script="error" |
| 112 |
- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do |
| 113 |
- if [ -d "$dir/rc0.d" ] && |
| 114 |
- [ -d "$dir/rc1.d" ] && |
| 115 |
- [ -d "$dir/rc2.d" ] && |
| 116 |
- [ -d "$dir/rc3.d" ] && |
| 117 |
- [ -d "$dir/rc4.d" ] && |
| 118 |
- [ -d "$dir/rc5.d" ] && |
| 119 |
- [ -d "$dir/rc6.d" ]; then |
| 120 |
- |
| 121 |
- # Now find the appropriate networking script. |
| 122 |
- if [ -d "$dir/init.d" ]; then |
| 123 |
- if [ -x "$dir/init.d/network" ]; then |
| 124 |
- script="$dir/init.d/network" |
| 125 |
- elif [ -x "$dir/init.d/networking" ]; then |
| 126 |
- script="$dir/init.d/networking" |
| 127 |
- fi |
| 128 |
- else |
| 129 |
- if [ -x "$dir/network" ]; then |
| 130 |
- script="$dir/network" |
| 131 |
- elif [ -x "$dir/networking" ]; then |
| 132 |
- script="$dir/networking" |
| 133 |
- fi |
| 134 |
- fi |
| 135 |
- fi |
| 136 |
- done |
| 137 |
- |
| 138 |
- echo "$script" |
| 139 |
-} |
| 140 |
- |
| 141 |
save_active_NIC_list() { |
| 142 |
ifconfig_path=`which ifconfig 2>/dev/null` |
| 143 |
if [ $? ]; then |
| 144 |
@@ -82,11 +51,6 @@ |
| 145 |
# `which' may be a bit noisy, so we'll shush it. |
| 146 |
dbusSend=`which dbus-send 2>/dev/null` |
| 147 |
if [ $? -eq 0 ]; then |
| 148 |
- # NetworkManager 0.6 |
| 149 |
- $dbusSend --system --dest=org.freedesktop.NetworkManager \ |
| 150 |
- /org/freedesktop/NetworkManager \ |
| 151 |
- org.freedesktop.NetworkManager.sleep |
| 152 |
- # NetworkManager 0.7.0 |
| 153 |
$dbusSend --system --dest=org.freedesktop.NetworkManager \ |
| 154 |
/org/freedesktop/NetworkManager \ |
| 155 |
org.freedesktop.NetworkManager.Sleep boolean:true |
| 156 |
@@ -107,16 +71,13 @@ |
| 157 |
|
| 158 |
save_active_NIC_list |
| 159 |
|
| 160 |
-network=`find_networking_script` |
| 161 |
-if [ "$network" != "error" ]; then |
| 162 |
- "$network" stop |
| 163 |
- # If the network is down, this may fail but that's not a good reason |
| 164 |
- # to prevent the suspend. |
| 165 |
- status=0 |
| 166 |
-else |
| 167 |
- echo "networking script not found" |
| 168 |
- status=1 |
| 169 |
-fi |
| 170 |
+for network in `ls /etc/init.d/net.*`; |
| 171 |
+do |
| 172 |
+ "$network" stop |
| 173 |
+done |
| 174 |
+# If the network is down, this may fail but that's not a good reason |
| 175 |
+# to prevent the suspend. |
| 176 |
+status=0 |
| 177 |
|
| 178 |
tranquilizeNetworkManager |
Archives