[arch-commits] Commit in open-vm-tools/trunk (5 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Mon Jun 17 17:29:38 UTC 2013
Date: Monday, June 17, 2013 @ 19:29:38
Author: spupykin
Revision: 92877
upgpkg: open-vm-tools 2:9.2.3-4
upd
Added:
open-vm-tools/trunk/network-script
Modified:
open-vm-tools/trunk/PKGBUILD
Deleted:
open-vm-tools/trunk/open-vm-tools-X11Bool.patch
open-vm-tools/trunk/scripts-network-FS19541.patch
open-vm-tools/trunk/scripts-network.patch
-------------------------------+
PKGBUILD | 15 ---
network-script | 197 ++++++++++++++++++++++++++++++++++++++++
open-vm-tools-X11Bool.patch | 15 ---
scripts-network-FS19541.patch | 38 -------
scripts-network.patch | 73 --------------
5 files changed, 201 insertions(+), 137 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-17 12:42:20 UTC (rev 92876)
+++ PKGBUILD 2013-06-17 17:29:38 UTC (rev 92877)
@@ -7,7 +7,7 @@
epoch=2
pkgver=9.2.3
_pkgsubver=1031360
-pkgrel=3
+pkgrel=4
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/"
@@ -21,18 +21,14 @@
options=('docs' '!libtool')
install=$pkgname.install
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz
- scripts-network.patch
- scripts-network-FS19541.patch
- open-vm-tools-X11Bool.patch
+ network-script
tools.conf
vmware-guestd
xautostart.conf
modprobe.conf
vmtoolsd.service)
md5sums=('71a1d8065b632692af2cdcc9d82f305e'
- 'b8f68fef3d388489e40dba581b6da18a'
- '921637fcb05cd68b1c8350fcb7d59d36'
- '8c333a979578bdc0c3134c1dd6bb7353'
+ '41db8f3db17f5b76248b09233a4355c4'
'b55d15e2c4be396aad709aeca91033d3'
'1b9ae908fce4c623269f100ee9bdfdef'
'75a25d83417e683957321f97a00f8465'
@@ -60,10 +56,7 @@
install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de
chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper
- cd "$pkgdir"
- patch -p1 -i "$srcdir"/scripts-network.patch etc/vmware-tools/scripts/vmware/network
- patch -p1 -i "$srcdir"/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network
-
+ install -Dm0755 "$srcdir"/network-script $pkgdir/etc/vmware-tools/scripts/vmware/network
install -Dm0644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf
install -Dm0644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf
install -Dm0644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd
Added: network-script
===================================================================
--- network-script (rev 0)
+++ network-script 2013-06-17 17:29:38 UTC (rev 92877)
@@ -0,0 +1,197 @@
+#!/bin/sh
+##########################################################
+# Copyright (C) 2001-2010 VMware, Inc. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation version 2.1 and no later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+##########################################################
+
+
+#
+# network (Linux)
+#
+# Using a combination of a system networking script, ifconfig, and ifup,
+# attempt to release and renew DHCP leases upon receipt of suspend and resume
+# events, respectively.
+#
+
+echo `date` ": Executing '$0'"
+echo
+
+. `dirname "$0"`/../../statechange.subr
+
+#
+# TranquilizeNetworkManager --
+#
+# Put the NetworkManager daemon to sleep (maybe).
+#
+# See http://projects.gnome.org/NetworkManager/developers/spec.html .
+#
+# Results:
+# Sleep(true) request is sent to the NetworkManager D-Bus interface.
+#
+# Side effects:
+# None.
+#
+
+TranquilizeNetworkManager()
+{
+ # `which' may be a bit noisy, so we'll shush it.
+ dbusSend=`which dbus-send 2>/dev/null`
+ rc=$?
+ if [ $rc -ne 0 ] || [ -z `pidof dbus-daemon` ]; then
+ return $rc
+ fi
+
+ # Check NetworkManager state before disabling it.
+ nm_state=`$dbusSend --system --print-reply \
+ --dest=org.freedesktop.NetworkManager \
+ /org/freedesktop/NetworkManager \
+ org.freedesktop.DBus.Properties.Get \
+ string:'org.freedesktop.NetworkManager' \
+ string:'State' \
+ | awk '/variant/ {print $3;}'`
+ if [ -z "$nm_state" ]; then
+ return 1
+ fi
+ # NetworkManager API 0.7/0.8 0.9
+ # NM_STATE_ASLEEP 1 10
+ # NM_STATE_DISCONNECTED 4 20
+ case $nm_state in
+ 1|4|10|20)
+ # Nothing needs to be done.
+ return 0
+ ;;
+ esac
+
+ # NetworkManager 0.8.0 and above
+ $dbusSend --system --print-reply \
+ --dest=org.freedesktop.NetworkManager \
+ /org/freedesktop/NetworkManager \
+ org.freedesktop.NetworkManager.Enable boolean:false
+ rc=$?
+ if [ $rc -eq 0 ]; then
+ return $rc
+ fi
+ # NetworkManager 0.7.0
+ $dbusSend --system --print-reply \
+ --dest=org.freedesktop.NetworkManager \
+ /org/freedesktop/NetworkManager \
+ org.freedesktop.NetworkManager.Sleep boolean:true
+ rc=$?
+ if [ $rc -eq 0 ]; then
+ return $rc
+ fi
+ # NetworkManager 0.6
+ $dbusSend --system --print-reply \
+ --dest=org.freedesktop.NetworkManager \
+ /org/freedesktop/NetworkManager \
+ org.freedesktop.NetworkManager.sleep
+ rc=$?
+
+ return $rc
+}
+
+
+#
+# WakeNetworkManager --
+#
+# Wake the NetworkManager daemon (maybe).
+#
+# See http://projects.gnome.org/NetworkManager/developers/spec.html .
+#
+# Results:
+# Sleep(false)request is sent to the NetworkManager D-Bus interface.
+#
+# Side effects:
+# None.
+#
+
+WakeNetworkManager()
+{
+ # `which' may be a bit noisy, so we'll shush it.
+ dbusSend=`which dbus-send 2>/dev/null`
+ rc=$?
+ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then
+ # NetworkManager 0.8.0
+ $dbusSend --system --print-reply \
+ --dest=org.freedesktop.NetworkManager \
+ /org/freedesktop/NetworkManager \
+ org.freedesktop.NetworkManager.Enable boolean:true
+ rc=$?
+ if [ $rc = 0 ]; then
+ return $rc
+ fi
+ # NetworkManager 0.7.0
+ $dbusSend --system --print-reply \
+ --dest=org.freedesktop.NetworkManager \
+ /org/freedesktop/NetworkManager \
+ org.freedesktop.NetworkManager.Sleep boolean:false
+ rc=$?
+ if [ $rc = 0 ]; then
+ return $rc
+ fi
+ # NetworkManager 0.6
+ $dbusSend --system --print-reply \
+ --dest=org.freedesktop.NetworkManager \
+ /org/freedesktop/NetworkManager \
+ org.freedesktop.NetworkManager.wake
+ rc=$?
+ fi
+ return $rc
+}
+
+
+#
+# main --
+#
+# Main entry point. Perform some sanity checking, then map state change
+# events to relevant networking operations.
+#
+# Results:
+# See comment at top of file.
+#
+
+main() {
+ exitCode=0
+
+ which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path."
+
+ case "$1" in
+ poweron-vm)
+ ;;
+ suspend-vm)
+ TranquilizeNetworkManager
+ exitCode=$?
+ if [ $exitCode != 0 ]; then
+ netctl store
+ netctl stop-all
+ exitCode=$?
+ fi
+ ;;
+ resume-vm)
+ WakeNetworkManager
+ exitCode=$?
+ if [ $exitCode != 0 ]; then
+ netctl restore
+ exitCode=$?
+ fi
+ ;;
+ *) ;;
+ esac
+
+ return $exitCode
+}
+
+main "$@"
Deleted: open-vm-tools-X11Bool.patch
===================================================================
--- open-vm-tools-X11Bool.patch 2013-06-17 12:42:20 UTC (rev 92876)
+++ open-vm-tools-X11Bool.patch 2013-06-17 17:29:38 UTC (rev 92877)
@@ -1,15 +0,0 @@
-diff -wbBur open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h
---- open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h 2010-08-24 19:59:22.000000000 +0000
-+++ open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h 2010-08-30 09:38:48.000000000 +0000
-@@ -83,8 +83,11 @@
-
- /* STRICT ANSI means the Xserver build and X defines Bool differently. */
- #if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__)
-+# ifndef _XTYPEDEF_BOOL
-+# define _XTYPEDEF_BOOL
- typedef char Bool;
- #endif
-+#endif
-
- #ifndef FALSE
- #define FALSE 0
Deleted: scripts-network-FS19541.patch
===================================================================
--- scripts-network-FS19541.patch 2013-06-17 12:42:20 UTC (rev 92876)
+++ scripts-network-FS19541.patch 2013-06-17 17:29:38 UTC (rev 92877)
@@ -1,38 +0,0 @@
---- network.orig 2013-05-06 01:26:27.000000000 +0400
-+++ network 2013-05-06 01:31:28.718026417 +0400
-@@ -89,7 +89,7 @@
- else
- echo `date` "[rescue_nic] activating $nic ..."
-
-- ifup $nic
-+ ip link set $nic up
- exitCode=`expr $exitCode \| $?`
- fi
- done < $activeList
-@@ -118,7 +118,7 @@
- # `which' may be a bit noisy, so we'll shush it.
- dbusSend=`which dbus-send 2>/dev/null`
- rc=$?
-- if [ $rc -ne 0 ]; then
-+ if [ $rc -ne 0 ] || [ -z `pidof dbus-daemon` ]; then
- return $rc
- fi
-
-@@ -191,7 +191,7 @@
- # `which' may be a bit noisy, so we'll shush it.
- dbusSend=`which dbus-send 2>/dev/null`
- rc=$?
-- if [ $rc = 0 ]; then
-+ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then
- # NetworkManager 0.8.0
- $dbusSend --system --print-reply \
- --dest=org.freedesktop.NetworkManager \
-@@ -237,7 +237,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 ifup >/dev/null 2>&1 || Panic "ifup not in search path."
- which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path."
-
- case "$1" in
Deleted: scripts-network.patch
===================================================================
--- scripts-network.patch 2013-06-17 12:42:20 UTC (rev 92876)
+++ scripts-network.patch 2013-06-17 17:29:38 UTC (rev 92877)
@@ -1,73 +0,0 @@
---- network.org 2012-03-17 22:20:11.000000000 +0400
-+++ network 2012-03-17 22:18:47.000000000 +0400
-@@ -34,51 +34,6 @@
-
-
- #
--# find_networking_script --
--#
--# Searches common Linux distro init/rc paths to find a singular network
--# services script.
--#
--# Result:
--# Returns a valid networking script path on success or "error" on failure.
--#
--# Side effects:
--# None.
--#
--
--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"
--}
--
--
--#
- # run_network_script --
- #
- # 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"
- }
-
-
More information about the arch-commits
mailing list