Accepting request 53968 from home:dimstar:branches:Virtualization:VMware

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/53968
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=169

vmtoolsd

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 #     Template SUSE system startup script for vmware-guest service/daemon
-#     Copyright (C) 2008  Dominique Leuenberger for openSUSE
+#     Copyright (C) 2008-2010  Dominique Leuenberger for openSUSE
 #
 #     This library is free software; you can redistribute it and/or modify it
 #     under the terms of the GNU Lesser General Public License as published by
@@ -35,6 +35,7 @@
 # Check for missing binaries (stale symlinks should not happen)
 # Note: Special treatment of stop for LSB conformance
 VMTOOLSD_BIN=/usr/bin/vmtoolsd
+VMTOOLSUSER_BIN=/usr/bin/vmware-user
 test -x $VMTOOLSD_BIN || { echo "$VMTOOLSD_BIN not installed"; 
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
@@ -82,6 +83,10 @@ case "$1" in
 	## Stop daemon with killproc(8) and if this fails
 	## killproc sets the return value according to LSB.
 
+	# We need to inform the User process that we're going down.
+	# Otherwise it keeps references on /proc/fs/vmblock/* and 
+	# causes issues when reloading vmblock module.
+	/sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
 	/sbin/killproc -TERM $VMTOOLSD_BIN
 	umount /proc/fs/vmblock/mountPoint || :
 	modprobe -r vmblock || :