packages: xorg-xserver-server/xorg-xserver-server-Xvfb.init - daemonize cor...

[pawelz]

Author: pawelz                       Date: Mon Sep 27 17:01:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- daemonize correctly
- create pid file
- set default options

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server-Xvfb.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-Xvfb.init
diff -u packages/xorg-xserver-server/xorg-xserver-server-Xvfb.init:1.1 packages/xorg-xserver-server/xorg-xserver-server-Xvfb.init:1.2
--- packages/xorg-xserver-server/xorg-xserver-server-Xvfb.init:1.1	Mon Sep 27 16:24:43 2010
+++ packages/xorg-xserver-server/xorg-xserver-server-Xvfb.init	Mon Sep 27 19:01:10 2010
@@ -7,8 +7,8 @@
 # description:	Xvfb long service description
 #
 # processname:	Xvfb
-# config:		/etc/X11/xorg.conf
-# pidfile:		/var/run/Xvfb.pid
+# config:	/etc/X11/xorg.conf
+# pidfile:	/var/run/Xvfb.pid
 #
 # $Id$
 
@@ -28,9 +28,17 @@
 	exit 0
 fi
 
+NOLISTEN="tcp"
+DISPLAY_NUMBER=":20"
+OPTIONS=""
+
 # Get service config - may override defaults
 [ -f /etc/sysconfig/Xvfb ] && . /etc/sysconfig/Xvfb
 
+for I in "$NOLISTEN"; do
+	OPTIONS=$OPTIONS" -nolisten $I"
+done
+
 start() {
 	# Check if the service is already running?
 	if [ -f /var/lock/subsys/Xvfb ]; then
@@ -38,9 +46,10 @@
 		return
 	fi
 
-	checkconfig
 	msg_starting "Xvfb"
-	daemon /usr/bin/Xvfb --makepid
+
+	# Beware the jabberwock!
+	daemon sh -c "\"exec sh -c 'echo \$\$ > /var/run/Xvfb.pid; exec /usr/bin/Xvfb $OPTIONS $DISPLAY_NUMBER' &\""
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/Xvfb
 }
@@ -54,7 +63,6 @@
 	# Stop daemons.
 	msg_stopping "Xvfb"
 	killproc Xvfb
-	killproc --pidfile /var/run/Xvfb.pid Xvfb -TERM
 	rm -f /var/lock/subsys/Xvfb
 }
 
@@ -93,7 +101,7 @@
 	RETVAL=$?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|try-restart|force-reload|checkconfig|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server-Xvfb.init?r1=1.1&r2=1.2&f=u