diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-19 00:01:09 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-19 00:01:09 +0000 |
| commit | de5b6982e42f4a1e8b0537cfbc1b676e2a81f195 (patch) | |
| tree | 54a8758af5dc5a08f95d12f7fe04cec1d51024a6 /community/open-vm-tools | |
| parent | d14a25fc4f65ae3d6e62f4668e9cb88d74834255 (diff) | |
Mon Mar 19 00:01:09 UTC 2012
Diffstat (limited to 'community/open-vm-tools')
| -rw-r--r-- | community/open-vm-tools/PKGBUILD | 12 | ||||
| -rw-r--r-- | community/open-vm-tools/scripts-network.patch | 84 |
2 files changed, 53 insertions, 43 deletions
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index 8f9711567..37c82a9e9 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62772 2012-01-26 14:44:28Z spupykin $ +# $Id: PKGBUILD 68082 2012-03-17 18:55:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools -pkgver=2011.12.20 -_pkgsubver=562307 -pkgrel=2 +pkgver=2012.03.13 +_pkgsubver=651368 +pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" @@ -24,8 +24,8 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('529c15cb6cfa2972a96664c504dee560' - '06f7448e274db2a911f582e276088fc9' +md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' + 'b8f68fef3d388489e40dba581b6da18a' '199508b0d3fe6fa9b726d09170bf51f1' '8c333a979578bdc0c3134c1dd6bb7353' '79b0a14d86191fee70a4639da8bd7785' diff --git a/community/open-vm-tools/scripts-network.patch b/community/open-vm-tools/scripts-network.patch index 13ea7f565..44c7e6dcb 100644 --- a/community/open-vm-tools/scripts-network.patch +++ b/community/open-vm-tools/scripts-network.patch @@ -1,5 +1,5 @@ ---- network.org 2010-04-28 10:21:14.000000000 +0000 -+++ network 2010-04-28 10:24:00.000000000 +0000 +--- network.org 2012-03-17 22:20:11.000000000 +0400 ++++ network 2012-03-17 22:18:47.000000000 +0400 @@ -34,51 +34,6 @@ @@ -17,47 +17,57 @@ -# - -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 +- 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 +- # 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" +- echo "$script" -} - - -# - # save_active_NIC_list -- + # run_network_script -- # - # Records a list of every active NIC to /var/run/vmware-active-nics. -@@ -205,7 +160,7 @@ - exitCode=0 - activeList=/var/run/vmware-active-nics + # Finds out how to run the system's script used to control networking, and +@@ -87,17 +42,7 @@ + # + run_network_script() + { +- script=`find_networking_script` +- [ "$script" != "error" ] || Panic "Cannot find system networking script." +- +- # Using SysV "service" if it exists, otherwise fall back to run the script directly +- service=`which service 2>/dev/null` +- if [ $? = 0 -a -n "$service" ]; then +- serviceName=`basename "$script"` +- "$service" "$serviceName" "$1" +- else +- "$script" "$1" +- fi ++ /etc/rc.d/network "$1" + } -- networkScript=`find_networking_script` -+ networkScript=/etc/rc.d/network - [ "$networkScript" != "error" ] || Panic "Cannot find system networking script." - # XXX Are these really necessary? If so, we should have seen customer |