rpms/tigervnc/devel tigervnc.spec,1.28,1.29 vncserver.init,1.3,1.4

[Jan Görig]

Author: jgorig

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30757

Modified Files:
	tigervnc.spec vncserver.init 
Log Message:
- initscript LSB compliance fixes (#523974)



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- tigervnc.spec	22 Jan 2010 11:01:44 -0000	1.28
+++ tigervnc.spec	27 Jan 2010 12:10:37 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:		tigervnc
 Version:	1.0.90
-Release:	0.4.%{snap}%{?dist}
+Release:	0.5.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -241,6 +241,9 @@ fi
 %endif
 
 %changelog
+* Wed Jan 27 2010 Jan Gorig <jgorig redhat com> 1.0.90-0.5.20091221svn3929
+- initscript LSB compliance fixes (#523974)
+
 * Fri Jan 22 2010 Adam Tkac <atkac redhat com> 1.0.90-0.4.20091221svn3929
 - mark stack as non-executable in jpeg ASM code
 - add xorg-x11-xauth to Requires


Index: vncserver.init
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/vncserver.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vncserver.init	8 Oct 2009 13:38:33 -0000	1.3
+++ vncserver.init	27 Jan 2010 12:10:37 -0000	1.4
@@ -24,6 +24,8 @@ prog=$"VNC server"
 RETVAL=0
 
 start() {
+    [ "$EUID" != "0" ] && exit 4
+    
     # Source networking configuration.
     . /etc/sysconfig/network
 
@@ -59,7 +61,7 @@ start() {
     else
         if [ "$RETVAL" -eq 0 ]; then
 	    success $"vncserver startup"
-	    touch /var/lock/subsys/vncserver
+	    touch /var/lock/subsys/Xvnc
         else 
             failure $"vncserver start"
         fi
@@ -68,12 +70,14 @@ start() {
 
 # As written in https://bugzilla.redhat.com/show_bug.cgi?id=523974 (LSB
 # compliance) start of already running service is OK.
-    [ "$RETVAL" -eq 98 ] && return 0
+    [ "$RETVAL" -eq 98 ] && RETVAL=0
 
     return "$RETVAL"
 }
 
 stop() {
+    [ "$EUID" != "0" ] && exit 4
+
     echo -n $"Shutting down $prog: "
 
     status Xvnc > /dev/null 2>&1
@@ -94,7 +98,7 @@ stop() {
     [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || \
 	failure $"vncserver shutdown"
     echo
-    [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/vncserver
+    [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/Xvnc
     return "$RETVAL"
 }
 
@@ -114,14 +118,14 @@ case "$1" in
   condrestart)
 #	https://bugzilla.redhat.com/show_bug.cgi?id=508367
 #	echo "condrestart is obsolete, use try-restart instead"
-	if [ -e /var/lock/subsys/vncserver ]; then
+	if [ -e /var/lock/subsys/Xvnc ]; then
 	    stop
 	    sleep 3
 	    start
 	fi
 	;;
   try-restart)
-        if [ -e /var/lock/subsys/vncserver ]; then
+        if [ -e /var/lock/subsys/Xvnc ]; then
             stop
             sleep 3
             start