[patch] The patch for fixing issues with Xvfb and virtualmake

virtualx.eclass.patch (text/plain), 1.04 KB, created by devsk on 2004-06-23 10:38:17 UTC

--- virtualx.eclass.ORG	2004-06-23 09:08:29.200639510 -0700
+++ virtualx.eclass	2004-06-23 10:33:54.870475953 -0700
@@ -20,7 +20,7 @@
 
 	#If $DISPLAY is not set, or xhost cannot connect to an X
 	#display, then do the Xvfb hack.
-	if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null)
+	if [ -z "$DISPLAY" ] ||  (/usr/X11R6/bin/xhost &>/dev/null)
 	then
 		export XAUTHORITY=
 		# The following is derived from Mandrake's hack to allow
@@ -32,7 +32,7 @@
 		export SANDBOX_DISABLED="1"
 		
 		local i=0
-		XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i})
+		XDISPLAY=$(i=0; while [ -f /tmp/.X11-unix/X${i}= ] ; do i=$((${i}+1));done; echo ${i})
 		
 		# If we are in a chrooted environment, and there is already a
 		# X server started outside of the chroot, Xvfb will fail to start
@@ -45,7 +45,7 @@
 		sleep 2
 		
 		local start=${XDISPLAY}
-		while [ ! -f /tmp/.X${XDISPLAY}-lock ]
+		while [ ! -f /tmp/.X11-unix/X${XDISPLAY}= ]
 		do
 			# Stop trying after 15 tries
 			if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then