- added check in initscript whether VMTOOLSUSER_BIN exists

OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=192
This commit is contained in:
Pavol Rusnak
2011-05-25 14:31:38 +00:00
committed by Git OBS Bridge
parent dedf49934e
commit 2028c61a75
4 changed files with 44 additions and 41 deletions

View File

@@ -23,9 +23,9 @@
### BEGIN INIT INFO
# Provides: vmtoolsd
# Required-Start: $syslog $remote_fs
# Should-Start:
# Should-Start:
# Required-Stop: $syslog $remote_fs
# Should-Stop:
# Should-Stop:
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: VMWare Tools Daemon
@@ -36,7 +36,7 @@
# 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";
test -x $VMTOOLSD_BIN || { echo "$VMTOOLSD_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
@@ -70,7 +70,7 @@ rc_reset
# 6 - program is not configured
# 7 - program is not running
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
#
#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
@@ -99,9 +99,11 @@ 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 /proc/fs/vmblock/* and
# causes issues when reloading vmblock module.
/sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
if [ -f "$VMTOOLSUSER_BIN" ]; then
/sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
fi
/sbin/killproc -TERM $VMTOOLSD_BIN
umount /proc/fs/vmblock/mountPoint || :
modprobe -r vmblock || :
@@ -156,7 +158,7 @@ case "$1" in
# 3 - service not running (unused)
# 4 - service status unknown :-(
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
# NOTE: checkproc returns LSB compliant status values.
/sbin/checkproc $VMTOOLSD_BIN
# NOTE: rc_status knows that we called this init script with