rpms/open-vm-tools/F-11 open-vm-tools-guestd.init, 1.1, 1.2 open-vm-tools.spec, 1.10, 1.11

[Denis Leroy]

Author: denis

Update of /cvs/free/rpms/open-vm-tools/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12970

Modified Files:
	open-vm-tools-guestd.init open-vm-tools.spec 
Log Message:
Fixed init startup script (#784)


Index: open-vm-tools-guestd.init
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-11/open-vm-tools-guestd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- open-vm-tools-guestd.init	10 Nov 2008 20:59:46 -0000	1.1
+++ open-vm-tools-guestd.init	25 Aug 2009 06:14:28 -0000	1.2
@@ -1,23 +1,23 @@
 #!/bin/bash
 #
-# Init file for open-vm-tools vmware-guestd daemon
+# Init file for open-vm-tools vmtoolsd daemon
 #
 # chkconfig: 345 80 20
 # description: open-vm-tools guest daemon
 #
-# processname: vmware-guestd
-# pidfile: /var/run/vmware-guestd.pid
+# processname: vmtoolsd
+# pidfile: /var/run/vmtoolsd.pid
 
 # source function library
 . /etc/rc.d/init.d/functions
 
 RETVAL=0
-prog="vmware-guestd"
+prog="vmtoolsd"
 
-GUESTD=/usr/sbin/vmware-guestd
-PID_FILE=/var/run/vmware-guestd.pid
-LOCK_FILE=/var/lock/subsys/vmware-guestd
-OPTIONS="--background $PID_FILE"
+GUESTD=/usr/bin/vmtoolsd
+PID_FILE=/var/run/vmtoolsd.pid
+LOCK_FILE=/var/lock/subsys/vmtoolsd
+OPTIONS="-b $PID_FILE"
 DND_DIR="/tmp/VMwareDnD"
 
 setup_modules()
@@ -42,7 +42,7 @@
 
 start()
 {
-	echo -n $"Starting $prog: "
+	echo -n $"Starting Open-vm-tools guest daemon: "
 	setup_modules
 	$GUESTD $OPTIONS && success || failure
 	RETVAL=$?
@@ -52,8 +52,8 @@
 
 stop()
 {
-	echo -n $"Stopping $prog: "
-	killall vmware-user
+	echo -n $"Stopping Open-vm-tools guest daemon: "
+	killall vmware-user 2>/dev/null
 	unmount_stuff
 	killproc $GUESTD
 	RETVAL=$?


Index: open-vm-tools.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-11/open-vm-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- open-vm-tools.spec	14 Aug 2009 06:50:32 -0000	1.10
+++ open-vm-tools.spec	25 Aug 2009 06:14:28 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:      open-vm-tools
 Version:   0.0.0.%{buildver}
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   VMware Guest OS Tools
 Group:     Applications/System
 License:   LGPLv2
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Tue Aug 25 2009 Denis Leroy <denis at poolshark.org> - 0.0.0.179896-2
+- Fixed init startup script (#784)
+
 * Fri Aug 14 2009 Denis Leroy <denis at poolshark.org> - 0.0.0.179896-1
 - Update to upstream build 179896
 - Some new content in devel package