Make some changes to the rc files to be more POSIX compliant. Also added support to vmware-workstation for Drag and Drop into the host.

svn path=/trunk/; revision=207

5 files changed, 65 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index fb51991..5a2e351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
 # $ Id: $
 
   18 Sep 2007; Mike Auty <ikelos@gentoo.org>
+  app-emulation/vmware-server/files/vmware-server.rc,
+  app-emulation/vmware-workstation/files/vmware-workstation.rc:
+  Make some changes to the rc files to be more POSIX compliant. Also added
+  support to vmware-workstation for Drag and Drop into the host.
+
+  18 Sep 2007; Mike Auty <ikelos@gentoo.org>
   app-emulation/open-vm-tools/files/open-vm.initd:
   Fix the order of creating the DnD directory and mount the vmblock filesystem.
 
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index f7a8266..36ed3a1 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -38,10 +38,10 @@ AUX vmware-authd 211 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 SHA1 514538
 MD5 11c744974bab5acd3c31d1e709bd7578 files/vmware-authd 211
 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 files/vmware-authd 211
 SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54 files/vmware-authd 211
-AUX vmware-server.rc 1540 RMD160 88d0d324c32ebe5557935601062af0125e7a8d75 SHA1 10b794d0f4a522a90d188b0ff7daebc313c0a0f5 SHA256 5a907ce287b12d6d81bdb4f8d714b8315abfbf66d721559be67bd20169cc8859
-MD5 4be77da74825450915d5c3724463a754 files/vmware-server.rc 1540
-RMD160 88d0d324c32ebe5557935601062af0125e7a8d75 files/vmware-server.rc 1540
-SHA256 5a907ce287b12d6d81bdb4f8d714b8315abfbf66d721559be67bd20169cc8859 files/vmware-server.rc 1540
+AUX vmware-server.rc 1529 RMD160 68ea21c32f2a4487327da8bf45cc30cf456190a3 SHA1 528907a6a9a67e32c79e9c2e1ff19f8c01e31b3f SHA256 f95fc28cfccaebcee0a2f7ffe38874b60d8c3ccb8f28fad2f674199d6e5aeb5c
+MD5 74e6560a1784a52e8a11ac888f88f3a4 files/vmware-server.rc 1529
+RMD160 68ea21c32f2a4487327da8bf45cc30cf456190a3 files/vmware-server.rc 1529
+SHA256 f95fc28cfccaebcee0a2f7ffe38874b60d8c3ccb8f28fad2f674199d6e5aeb5c files/vmware-server.rc 1529
 AUX vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 MD5 aa1b576735134579f04b29763901dc4f files/vmware-server.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware-server.xml 1592
diff --git a/app-emulation/vmware-server/files/vmware-server.rc b/app-emulation/vmware-server/files/vmware-server.rc
index 6385ee6..6606dd6 100644
--- a/app-emulation/vmware-server/files/vmware-server.rc
+++ b/app-emulation/vmware-server/files/vmware-server.rc
@@ -16,54 +16,53 @@ vmware_prettify() {
 	msgtype=0
 	while read line
 	do
-		[ "$line" = "" ] && continue
+		[ "${line}" = "" ] && continue
 		if [ ${msgtype} -le 0 ]
 		then
 			if [ ${msgtype} -eq -1 ]
 			then
-				ewarn $line
+				ewarn ${line}
 				continue
 			fi
-			if echo ${line} | fgrep -q :
-			then
-				einfon $line
+			case ${line} in
+			*:*)
+				einfon ${line}
 				echo
 				eend 0
-				msgtype=1
-			elif echo $line | grep -q "Stopping VMware virtual machines"
-			then
-				einfon $line
+				msgtype=1;;
+			*Stopping\ VMware\ virtual\ machines*)
+				einfon ${line}
 				echo
 				eend 0
-				msgtype=0
-			else
-				ewarn $line
+				msgtype=0;;
+			*)
+				ewarn ${line}
 				msgtype=-1
-				waserror=1
-			fi
+				waserror=1;;
+			esac
 			continue
 		fi
 
 		# Strip out anything after the <esc> code
-		message=`echo $line | sed -e "s/^\(.*\).*$/\1/"`
-		einfon "  $message"
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
 		echo
 
 		echo ${line} | grep -q done
 		status=$?
-		eend $status
+		eend ${status}
 
-		if [ $status -eq 0 ]
+		if [ ${status} -eq 0 ]
 		then
-			logger -p local0.err -t vmware-${state} "$line"
-			waserror=$status
+			logger -p local0.err -t vmware-${state} "${line}"
+			waserror=${status}
 		fi
 	done
-	if [ "$msgtype" = "-1" ]
+	if [ "${msgtype}" = "-1" ]
 	then
 		eend 1 "VMware is not properly configured! See above."
 	fi
-	return $waserror
+	return ${waserror}
 }
 
 start() {
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 106ea82..606768e 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -26,10 +26,10 @@ AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA
 MD5 aff74afc68b848e408f93e60bdf847c9 files/90vmware-workstation 106
 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a files/90vmware-workstation 106
 SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e files/90vmware-workstation 106
-AUX vmware-workstation.rc 1425 RMD160 61d9725a8b75e0fd919f2f1c5f0340695600b10d SHA1 a839b18f2c1a048161a0cbcc1a09842e05063921 SHA256 0853d97e09c1861fd27ccb72977d64e49af69daedc9122922d5fd604e040f5b1
-MD5 38c658493da5770808944126863f7df0 files/vmware-workstation.rc 1425
-RMD160 61d9725a8b75e0fd919f2f1c5f0340695600b10d files/vmware-workstation.rc 1425
-SHA256 0853d97e09c1861fd27ccb72977d64e49af69daedc9122922d5fd604e040f5b1 files/vmware-workstation.rc 1425
+AUX vmware-workstation.rc 1862 RMD160 7d69bc0b51d5d054e176a9946a129445121fd14c SHA1 80ce79a05ed5dea128c539a3610f458b561f7598 SHA256 d2247e8665002253e93579cbb63b86660c244bb9cc8b8689cd75845bb2051a3f
+MD5 25c833bf39230143a8664ba734648d1c files/vmware-workstation.rc 1862
+RMD160 7d69bc0b51d5d054e176a9946a129445121fd14c files/vmware-workstation.rc 1862
+SHA256 d2247e8665002253e93579cbb63b86660c244bb9cc8b8689cd75845bb2051a3f files/vmware-workstation.rc 1862
 AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 MD5 aa1b576735134579f04b29763901dc4f files/vmware-workstation.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware-workstation.xml 1592
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation.rc b/app-emulation/vmware-workstation/files/vmware-workstation.rc
index 0eb17e2..c3b3f63 100644
--- a/app-emulation/vmware-workstation/files/vmware-workstation.rc
+++ b/app-emulation/vmware-workstation/files/vmware-workstation.rc
@@ -16,59 +16,71 @@ vmware_prettify() {
 	msgtype=0
 	while read line
 	do
-		[ "$line" = "" ] && continue
+		[ "${line}" = "" ] && continue
 		if [ ${msgtype} -le 0 ]
 		then
 			if [ ${msgtype} -eq -1 ]
 			then
-				ewarn $line
+				ewarn ${line}
 				continue
 			fi
-			if echo ${line} | fgrep -q :
-			then
-				einfon $line
+			case ${line} in
+			*:*)
+				einfon ${line}
 				echo
 				eend 0
-				msgtype=1
-			else
-				ewarn $line
+				msgtype=1;;
+			*)
+				ewarn ${line}
 				msgtype=-1
-				waserror=1
-			fi
+				waserror=1;;
+			esac
 			continue
 		fi
 
 		# Strip out anything after the <esc> code
-		message=`echo $line | sed -e "s/^\(.*\).*$/\1/"`
-		einfon "  $message"
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
 		echo
 
 		echo ${line} | grep -q done
 		status=$?
-		eend $status
+		eend ${status}
 
-		if [ $status -eq 0 ]
+		if [ ${status} -eq 0 ]
 		then
-			logger -p local0.err -t vmware-${state} "$line"
-			waserror=$status
+			logger -p local0.err -t vmware-${state} "${line}"
+			waserror=${status}
 		fi
 	done
-	if [ "$msgtype" = "-1" ]
+	if [ "${msgtype}" = "-1" ]
 	then
 		eend 1 "VMware is not properly configured! See above."
 	fi
-	return $waserror
+	return ${waserror}
 }
 
 start() {
 	test -x /etc/vmware/init.d/vmware || \
 		eend 1 "vmware init script not found. Aborting" || return 1
 
+	if modinfo vmblock > /dev/null 2>&1;
+	then
+		ebegin "Loading vmblock for drag and drop support"
+		local result
+		modprobe vmblock || eend 1 "Failed to load vmblock driver"
+		test ! -e /tmp/VMwareDnD && mkdir /tmp/VMwareDnD
+		chmod 1777 /tmp/VMwareDnD
+		mount -t vmblock none /proc/fs/vmblock/mountPoint || eend 1 "Failed to mount the vmblock filesystem"
+		eend 0
+	fi
+
 	/etc/vmware/init.d/vmware start | vmware_prettify start
 	return $?
 }
 
 stop() {
+	umount /proc/fs/vmblock/mountPoint > /dev/null 2>&1
 	/etc/vmware/init.d/vmware stop | vmware_prettify stop
 	return $?
 }