vmware-workstation-server.rc fixes

svn path=/trunk/; revision=501

3 files changed, 28 insertions, 6 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index c3dd21c..0b74dc7 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -2,11 +2,11 @@ AUX list-bundle-components.xsl 470 RMD160 c45fe9d1690eac831c79bc63ef68de45d12658
 AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4 SHA1 40b6e4cd0bb189ec9997e8b6009c9508082ed51a SHA256 6682c07630ef4586016776e065018f8695a790c5297408597b1ae24692fab629
 AUX vmware-7.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
 AUX vmware-8.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
-AUX vmware-server-8.0.rc 873 RMD160 84b228d2ec1d106c095356a3832d427abe6eab64 SHA1 1a1fa484a11fe46e3b902a1d75346d0129cde9ea SHA256 707a15bede77dee8ddcb092953355e8904544a20dcec8b08d2aaefd909c84f4c
+AUX vmware-server-8.0.rc 1565 RMD160 e11b805ec016afac18778dc1a4af8db963ea2840 SHA1 62ffb7217b6d50a096a535e4c7016862f9cf6eaa SHA256 d33c1afd281502c7ceb6e1d5b981395b055fca6fd927b6aa98c449efd20e018e
 DIST VMware-Workstation-7.1.4-385536.i386.bundle 131082749 RMD160 84852552195777ce636a6128cf8ff8c539e045dd SHA1 955b3a08375bb1fa39cb9c1c4142f13de604acf6 SHA256 abf63c5b922660307b62e47138d612e3c3ba2d7520b344d6a2d1e2f69a88ddff
 DIST VMware-Workstation-7.1.4-385536.x86_64.bundle 137897638 RMD160 c71a351e5d59f28f468907074170d3c0ca03c98c SHA1 58973839c0ff6f56a9d2371a1ca1b5189b3f7bc5 SHA256 75bcbae6cfdaa6ae920a4172171eaa8c49b36464f485df3ccd29e5d59b9ead73
 DIST VMware-Workstation-Full-8.0.0-471780.i386.bundle 337749469 RMD160 6505d7511ce86f55cff392faa220021c0e5b5e7f SHA1 00a7a255e060fb2883b32c4267b16ad7af204e5c SHA256 6fbdd01c7ee378bc3352b8c230bec0deae352e3aa0e3d0101fe2af3aab6fcff7
 DIST VMware-Workstation-Full-8.0.0-471780.x86_64.bundle 337435853 RMD160 ed5881078e7eb60699f6d0180c305f6a240e4360 SHA1 1e75bda32c0dd7aa81d1953464d35236335ddf6e SHA256 6a9099659484a1de2bee50c96ddd3dc1b91c6ab02b067288e1c17c2b6d5a9f9a
 EBUILD vmware-workstation-7.1.4.385536.ebuild 8149 RMD160 fdd3b8fab6b2d9f12ddc14156be121fed2c8ef2b SHA1 8558030f0614d9f44402565e62dee87c81a12db8 SHA256 d32847886eb59ea30b7a0f59d306873e16e1583a7fb0ebe1ab7bdc9ba069dd85
-EBUILD vmware-workstation-8.0.0.471780-r4.ebuild 13221 RMD160 563a7fe4abf2b35b3d6ea351a9abd34b83697cdb SHA1 16f98caec8cf46874fce5939db8c509d175b87f2 SHA256 b212ec7ac7d088a3382928f3c2f3ebae2ecb2a8a836e622e686369e9e0a24b69
+EBUILD vmware-workstation-8.0.0.471780-r5.ebuild 13264 RMD160 2fbd1127c11009c69d4e7fdfb45397734511a8f5 SHA1 fd78058d0d5782791dfd61265fa3f51aadd6b889 SHA256 d8ee704a1c1d80fa19b6c710446c416ea7d9b3cd5a522a67faadfdc7adebba82
 MISC metadata.xml 821 RMD160 3fe06e26c1f6550712d29d27dbbe1bde8eeb3d29 SHA1 4cacecf9b113a8c46e921e1738d5c191bf693872 SHA256 b5634de5978f816c03495e72d4ee1cb72b372209ee7b8a8e88cec8963aa38647
diff --git a/app-emulation/vmware-workstation/files/vmware-server-8.0.rc b/app-emulation/vmware-workstation/files/vmware-server-8.0.rc
index e760944..302db72 100644
--- a/app-emulation/vmware-workstation/files/vmware-server-8.0.rc
+++ b/app-emulation/vmware-workstation/files/vmware-server-8.0.rc
@@ -4,7 +4,7 @@
 # $Header: $
 
 depend() {
-	need localmount
+	need localmount vmware
 	use net
 }
 
@@ -20,15 +20,36 @@ checkconfig() {
 start() {
 	checkconfig
 
+	ebegin Starting VMware Authentication Daemon
+	start-stop-daemon --start \
+	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
 	ebegin Starting VMware Workstation Server
-	start-stop-daemon --start --quiet --exec @@BINDIR@@/vmware-hostd \
-	    -- -a -d @@ETCDIR@@/hostd/config.xml
+	start-stop-daemon --start \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd \
+	  -- -a -d @@ETCDIR@@/hostd/config.xml
 
 	eend $?
 }
 
 stop() {
+	ebegin "Shutdown VMs in the AutoStart Sequence"
+	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
+
+	if [ "x" != "x${HOHO_ADMIN}" ]; then
+		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
+	fi
+	eend $?
+
 	ebegin Stopping VMware Workstation Server
-	start-stop-daemon --stop --quiet --exec @@BINDIR@@/vmware-hostd 
+	start-stop-daemon --stop \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd 
+	eend $?
+	ebegin Stopping VMware Authentication Daemon
+	#start-stop-daemon --stop \
+	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	killall @@PREFIX@@/sbin/vmware-authdlauncher
 	eend $?
 }
diff --git a/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r5.ebuild
index ce73b4f..3ef8950 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r4.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r5.ebuild
@@ -353,6 +353,7 @@ src_install() {
 		# install the init.d script
 		local initscript="${T}/vmware-workstation-server.rc"
 		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
 			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
 			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
 			"${FILESDIR}/vmware-server-8.0.rc" > ${initscript}