[gentoo-commits] gentoo-x86 commit in app-emulation/open-vm-tools/files: open-vm-tools.initd

[Mike Gilbert (floppym)]

floppym     13/10/31 20:07:13

  Modified:             open-vm-tools.initd
  Log:
  Rewrite init script, bug 489252.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

Revision  Changes    Path
1.4                  app-emulation/open-vm-tools/files/open-vm-tools.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd?r1=1.3&r2=1.4

Index: open-vm-tools.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- open-vm-tools.initd	17 Jul 2011 13:23:00 -0000	1.3
+++ open-vm-tools.initd	31 Oct 2013 20:07:13 -0000	1.4
@@ -1,76 +1,60 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd,v 1.3 2011/07/17 13:23:00 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd,v 1.4 2013/10/31 20:07:13 floppym Exp $
 
-DND_TMPDIR="/tmp/VMwareDnD"
-USER_GROUP="root:vmware"
-DND_TMPDIR_PERMS="1777"
-GUESTD_BIN="/usr/bin/vmtoolsd"
-PIDFILE="/var/run/vmtoolsd.pid"
-MOUNTPOINT="/proc/fs/vmblock/mountPoint"
+pidfile="/run/vmtoolsd.pid"
+command="/usr/bin/vmtoolsd"
+command_args="-b ${pidfile}"
+
+vmblockmntpt="/proc/fs/vmblock/mountPoint"
+vmblockfusemntpt="/run/vmblock-fuse"
 
 depend() {
 	before checkfs fsck net X
 }
 
-start() {
-	if [ "${VM_DRAG_AND_DROP}" == "yes" ];
-	then
-
-		if ! grep -q -w vmblock /proc/modules;
-		then
-			ebegin "Loading vmblock module"
-			modprobe vmblock
-			eend $?
-			sleep 0.25
-		fi
-
-		if [[ ! -d "${DND_TMPDIR}" ]];
-		then
-			# einfo "Creating the VM drag and drop directory"
-			mkdir "${DND_TMPDIR}"
-			chown "${USER_GROUP}" "${DND_TMPDIR}"
-			chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}"
-		fi
-
-		# DnD_TMPDIR must exist before vmblock can be mounted
-		ebegin "Mounting vmblock device"
-		mount -t vmblock none ${MOUNTPOINT}
+start_vmblock() {
+	checkpath -d -m 1777 /tmp/VMwareDnD
+	if command -v vmware-vmblock-fuse > /dev/null; then
+		modprobe fuse > /dev/null 2>&1
+		checkpath -d "${vmblockfusemntpt}"
+		ebegin "Mounting vmblock-fuse"
+		vmware-vmblock-fuse \
+			-o subtype=vmware-vmblock,default_permissions,allow_other \
+			"${vmblockfusemntpt}"
+		eend $?
+	else
+		modprobe vmblock > /dev/null 2>&1
+		checkpath -d "${vmblockmntpt}"
+		ebegin "Mounting vmblock"
+		mount -t vmblock vmblock "${vmblockmntpt}"
 		eend $?
 	fi
-	
-	ebegin "Starting vmtoolsd"
-	start-stop-daemon --user "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN}
-	eend $?
 }
 
-stop() {
-	local ret
-	
-	if [ "${VM_DRAG_AND_DROP}" == "yes" ];
-	then
-		ebegin "Cleaning the contents of ${DND_TMPDIR}"
-		# First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/*
-		if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]];
-		then
-			rm -rf ${DND_TMPDIR}/*
-			ret=0
-		else
-			eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable"
-			ret=1
-		fi
-		eend $ret
-
-		ebegin "Unmounting vmblock device"
-		if grep -q -w "${MOUNTPOINT}" /proc/mounts;
-		then
-			umount ${MOUNTPOINT} 1>&2 > /dev/null
-		fi
-		eend 0
+stop_vmblock() {
+	if [ -d "${vmblockfusemntpt}" ]; then
+		ebegin "Unmounting vmblock-fuse"
+		umount "${vmblockfusemntpt}"
+		eend $?
+	else
+		ebegin "Unmounting vmblock"
+		umount "${vmblockmntpt}"
+		eend $?
 	fi
+}
 
-	ebegin "Stopping vmtoolsd"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend $?
+start_pre() {
+	if [ x"${VM_DRAG_AND_DROP}" = xyes ]; then
+		start_vmblock
+	fi
+	return 0
+}
+
+stop_post() {
+	if [ x"${VM_DRAG_AND_DROP}" = xyes ]; then
+		stop_vmblock
+	fi
+	return 0
 }