commit aa2b0500363b2c935838d3828a9838cbcd5745e2
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Sat Apr 12 19:17:17 2014 +0300
Xvfb initscript: use --makepid --fork --pidfile instead of shell hackery
xorg-xserver-server-Xvfb.init | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/xorg-xserver-server-Xvfb.init b/xorg-xserver-server-Xvfb.init
old mode 100644
new mode 100755
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
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/aa2b0500363b2c935838d3828a9838cbcd5745e2
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
