Dominique Leuenberger 2013-04-03 19:43:10 +00:00 committed by Git OBS Bridge
parent f2c642751f
commit 9d47d891e9
2 changed files with 8 additions and 6 deletions

View File

@ -10,7 +10,9 @@ Wed Apr 3 18:26:54 UTC 2013 - dimstar@opensuse.org
- Rebase open-vm-tools-kernel-3.6.patch: mostly fixed upstream.
- No longer build vmblock.ko: it's been obsoleted in favor of
vmblock-fuse.
Fixes bnc#803157.
- Change vmtoolsd to use vmware-vmblock-fuse instead of vmblock.ko,
using the new mount point /var/run/vmblock-fuse.
* Fixes bnc#803157.
-------------------------------------------------------------------
Sat Mar 2 08:16:26 UTC 2013 - coolo@suse.com

View File

@ -81,8 +81,9 @@ case "$1" in
if [ ! -d /tmp/VMwareDnD ]; then
mkdir -m 1777 /tmp/VMwareDnD
fi
modprobe vmblock
mount -t vmblock none /proc/fs/vmblock/mountPoint
/usr/bin/vmware/vmblock-fuse \
-o subtype=vmware-vmblock,default_permissions,allow_other \
/var/run/vmblock-fuse
modprobe $VMBALLOON
modprobe vmsync
## Start daemon with startproc(8). If this fails
@ -98,14 +99,13 @@ case "$1" in
## 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
# Otherwise it keeps references on /var/run/vmblock-fuse/* and
# causes issues when reloading vmblock module.
if [ -f "$VMTOOLSUSER_BIN" ]; then
/sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
fi
/sbin/killproc -TERM $VMTOOLSD_BIN
umount /proc/fs/vmblock/mountPoint || :
modprobe -r vmblock || :
umount /var/run/vmblock-fuse || :
modprobe -r vmsync || :
modprobe -r $VMBALLOON || :