add new patch
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@1580 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
5e4c1a1787
commit
a9b2fc5d9b
|
|
@ -1,4 +1,5 @@
|
|||
AUX default-scripts.patch 3525 RMD160 7c3dfd342be245531493a9cf7a8be2be4c67dc4b SHA1 56ba6ca91262f73732a7d806a9c812aea683c2d2 SHA256 99ad1a202335736c50bbb92432371e522934d1a3347e992158b881cf9f810da6
|
||||
AUX default-scripts1.patch 4787 RMD160 3186d91d1f6f840bb7fb2e757b802ba05675894b SHA1 5843708e342b8c57f600a6cbd7d0b12f7f14a35b SHA256 3190fe24e2b03e99fa0b7b9f93d413c7b886138c1e964ca7917a45099f29609e
|
||||
AUX open-vm-tools-2009.05.22-167859-libproc-1.patch 735 RMD160 84fb9eff574b0a3649d81d486f254961023581c9 SHA1 f8bad2ca564256e249d32dac2a8c78c9a377a853 SHA256 8c4dd0efa7405d358b18c7447da34288245206795d0ab9b9b261fae71bb588a2
|
||||
AUX open-vm-tools-build-fix.patch 836 RMD160 463fd9f2fb2b704fe8d3eab41c211f21ae47818c SHA1 075d14e85e46eabe5a6a1a0a5d318453c323b9e9 SHA256 07d9c7bb228e7d5d1299e5fb5052109218e5d1ad074b4ea8fe2b54f22cc26ed6
|
||||
AUX open-vm-tools.desktop 127 RMD160 375ec8cd688a5fe0609076798e515c048be81c15 SHA1 6b6adcb93fbcb11e1638d6a80b3828256f880dcf SHA256 7cb78f0d94f1849aa964bc8e9d9a6c49955ba1a9b937174b1c266a9cc8eb4bc3
|
||||
|
|
@ -12,6 +13,6 @@ DIST open-vm-tools-2009.10.15-201664.tar.gz 3507956 RMD160 14a26a7423c97398afe00
|
|||
EBUILD open-vm-tools-0.0.2009.05.22_p167859.ebuild 2330 RMD160 95591bd7ed4bb5ba9d07fb725d6deceea0c538cd SHA1 3d9fe2096ecf7ae8d2c3148d83b0f656960283f2 SHA256 a3a43bc3d8e93245db6ab7f01e572d2fdf0c898f78b5d284b64ec9a35ac2f7f4
|
||||
EBUILD open-vm-tools-0.1.2009.06.18_p172495.ebuild 2332 RMD160 6bc13ad30488c390b90bce56faf780f0b1b20920 SHA1 93453fe8ac44dff42933e2eedacd59750aa09c54 SHA256 dba620d4e83212952471715854d0a78cffb0fb8ae4cd4cb09cce672021153ecd
|
||||
EBUILD open-vm-tools-0.1.2009.07.22_p179896.ebuild 2332 RMD160 6bc13ad30488c390b90bce56faf780f0b1b20920 SHA1 93453fe8ac44dff42933e2eedacd59750aa09c54 SHA256 dba620d4e83212952471715854d0a78cffb0fb8ae4cd4cb09cce672021153ecd
|
||||
EBUILD open-vm-tools-0.1.2009.10.15_p201664.ebuild 2332 RMD160 6bc13ad30488c390b90bce56faf780f0b1b20920 SHA1 93453fe8ac44dff42933e2eedacd59750aa09c54 SHA256 dba620d4e83212952471715854d0a78cffb0fb8ae4cd4cb09cce672021153ecd
|
||||
EBUILD open-vm-tools-0.1.2009.10.15_p201664.ebuild 2333 RMD160 82458f5245f7d28fccf314c9e7c5547eba26c705 SHA1 98b0d87fa3d664c8bd9d491a7022fa04c6cbb610 SHA256 f64145b2fb3ddad9881c5d0344a48cf49895e001320cb6fb07ee90204a18ebaf
|
||||
MISC ChangeLog 1923 RMD160 f395b14e586294dd615c31375a4b8bb0dd39a2fb SHA1 114a02c5077a0ba78f4d84ca88894750ac23a0ce SHA256 3782bca65a1eabac0bfab5a3240634395aad0ec377cd71218b418666a3365835
|
||||
MISC metadata.xml 273 RMD160 868f3e6ce2b19d6874be333eb73f9320df75605f SHA1 a5fa804bbe72aee73c241218da87736c81ff3815 SHA256 3528eb8ce4ae248c296a08cd9c3d252fbb4421fe5369ec3b5353b3c4f0da025d
|
||||
|
|
|
|||
|
|
@ -0,0 +1,163 @@
|
|||
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
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ pkg_setup() {
|
|||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/default-scripts.patch"
|
||||
epatch "${FILESDIR}/default-scripts1.patch"
|
||||
# epatch "${FILESDIR}/wiper-warning-fix.patch"
|
||||
# epatch "${FILESDIR}/open-vm-tools-build-fix.patch"
|
||||
epatch "${FILESDIR}/open-vm-tools-2009.05.22-167859-libproc-1.patch"
|
||||
|
|
|
|||
Loading…
Reference in New Issue