rpms/vnc/devel vnc.spec, 1.173, 1.174 vncserver.init, 1.11, 1.12 vnc-fPIC.patch, 1.4, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18741

Modified Files:
	vnc.spec vncserver.init 
Removed Files:
	vnc-fPIC.patch 
Log Message:
initscript is ready for parallel booting (#247092)



Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- vnc.spec	8 Jun 2007 11:46:09 -0000	1.173
+++ vnc.spec	17 Jul 2007 10:43:40 -0000	1.174
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   18%{?dist}
+Release:   19%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -313,6 +313,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Tue Jul 17 2007 Adam Tkac <atkac redhat com> 4.1.2-19.fc8
+- initscript is ready for parallel booting (#247092)
+
 * Thu Jun 08 2007 Adam Tkac <atkac redhat com> 4.1.2-18.fc8
 - added 24bit support to Xvnc
 - handle RENDER extension better


Index: vncserver.init
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vncserver.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vncserver.init	28 Feb 2006 10:31:54 -0000	1.11
+++ vncserver.init	17 Jul 2007 10:43:40 -0000	1.12
@@ -4,48 +4,68 @@
 # description: Starts and stops vncserver. \
 #	       used to provide remote X administration services.
 
+### BEGIN INIT INFO
+# Provides: vncserver
+# Required-Start: $network $named
+# Required-Stop: $network $named
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 4 6
+# Short-Description: start|stop|restart|try-restart|status|force-reload vncserver
+# Description: control vncserver which exports your desktop
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-unset VNCSERVERARGS
-VNCSERVERS=""
-[ -f /etc/sysconfig/vncservers ] && . /etc/sysconfig/vncservers
+[ -r /etc/sysconfig/vncservers ] && . /etc/sysconfig/vncservers
 
 prog=$"VNC server"
 
+RETVAL=0
+
 start() {
+    # Source networking configuration.
+    . /etc/sysconfig/network
+
+    # Check that networking is up.
+    [ ${NETWORKING} = "no" ] && exit 1
+
+    [ -x /usr/bin/vncserver ] || exit 5
+    [ -x /usr/bin/Xvnc ] || exit 5
+
     echo -n $"Starting $prog: "
-    ulimit -S -c 0 >/dev/null 2>&1
     RETVAL=0
     if [ ! -d /tmp/.X11-unix ]
     then
         mkdir -m 1777 /tmp/.X11-unix || :
         restorecon /tmp/.X11-unix 2>/dev/null || :
     fi
-    NOSERV=1
+
     for display in ${VNCSERVERS}
     do
-        NOSERV=
+        SERVS=1
         echo -n "${display} "
-	unset BASH_ENV ENV
 	DISP="${display%%:*}"
-	export USER="${display##*:}"
-	export VNCUSERARGS="${VNCSERVERARGS[${DISP}]}"
-        runuser -l ${USER} -c "cd ~${USER} && [ -f .vnc/passwd ] && vncserver :${DISP} ${VNCUSERARGS}"
+	USER="${display##*:}"
+	VNCUSERARGS="${VNCSERVERARGS[${DISP}]}"
+        runuser -l ${USER} -c "cd ~${USER} && [ -r .vnc/passwd ] && vncserver :${DISP} ${VNCUSERARGS}"
         RETVAL=$?
-        [ "$RETVAL" -ne 0 ] && break
+        [ "$RETVAL" -eq 0 ] || break
     done
-    if test -n "$NOSERV"; then echo -n "no displays configured "; fi
-    [ "$RETVAL" -eq 0 ] && success $"vncserver startup" || \
-        failure $"vncserver start"
+    if [ -z "$SERVS" ]; then
+        echo -n "no displays configured "
+        failure
+        RETVAL=6
+    else
+        if [ "$RETVAL" -eq 0 ]; then
+	    success $"vncserver startup"
+	    touch /var/lock/subsys/vncserver
+        else 
+            failure $"vncserver start"
+        fi
+    fi
     echo
-    [ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/vncserver
+    return "$RETVAL"
 }
 
 stop() {
@@ -53,7 +73,6 @@
     for display in ${VNCSERVERS}
     do
         echo -n "${display} "
-	unset BASH_ENV ENV
 	export USER="${display##*:}"
 	runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
     done
@@ -62,6 +81,7 @@
         failure $"vncserver shutdown"
     echo
     [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/vncserver
+    return "$RETVAL"
 }
 
 # See how we were called.
@@ -72,23 +92,34 @@
   stop)
 	stop
 	;;
-  restart|reload)
+  restart|force-reload)
 	stop
 	sleep 3
 	start
 	;;
   condrestart)
-	if [ -f /var/lock/subsys/vncserver ]; then
+	echo "condrestart is obsolete, use try-restart instead"
+	if [ -e /var/lock/subsys/vncserver ]; then
 	    stop
 	    sleep 3
 	    start
 	fi
 	;;
+  try-restart)
+        if [ -e /var/lock/subsys/vncserver ]; then
+            stop
+            sleep 3
+            start
+        fi
+        ;;
   status)
 	status Xvnc
+	RETVAL=$?
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
+	echo $"Usage: $0 {start|stop|restart|try-restart|status|force-reload}"
+	exit 3
 esac
 
+exit "$RETVAL"
+


--- vnc-fPIC.patch DELETED ---