Xvfb initscript: use --makepid --fork --pidfile instead of shell hackery

diff --git a/xorg-xserver-server-Xvfb.init b/xorg-xserver-server-Xvfb.init
old mode 100644 (file)
new mode 100755 (executable)
index b67cfe8..e7f6740
--- a/xorg-xserver-server-Xvfb.init
+++ b/xorg-xserver-server-Xvfb.init
@@ -10,8 +10,6 @@
 # config:      /etc/X11/xorg.conf
 # pidfile:     /var/run/Xvfb.pid
 #
-# $Id$
-
 # Source function library
 . /etc/rc.d/init.d/functions
 
@@ -47,9 +45,7 @@ start() {
        fi
 
        msg_starting "Xvfb"
-
-       # Beware the jabberwock!
-       daemon sh -c "\"exec sh -c 'echo \$\$ > /var/run/Xvfb.pid; exec /usr/bin/Xvfb $OPTIONS $DISPLAY_NUMBER' &\""
+       daemon --makepid --fork --pidfile /var/run/Xvfb.pid /usr/bin/Xvfb $OPTIONS $DISPLAY_NUMBER
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/Xvfb
 }