From f95207880a672e9cf9bcf93bb6ce36078d15e057 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Mon, 8 Mar 2010 00:08:21 +0100
Subject: [PATCH] xorg-server: - remove setting of $DISPLAY variable (done in
 configfile) - enable fastboot support

---
 .../x11/xserver/xorg-server/init.d/60_xorg    | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/init.d/60_xorg b/packages/x11/xserver/xorg-server/init.d/60_xorg
index 4633055672..5dd0d31718 100644
--- a/packages/x11/xserver/xorg-server/init.d/60_xorg
+++ b/packages/x11/xserver/xorg-server/init.d/60_xorg
@@ -2,12 +2,9 @@
 #
 # runlevels: openelec
 
-DISPLAY=':0.0'
 XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
 XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nolisten tcp"
 
-export DISPLAY
-
 #-------------------------------------------------------------------------------
 # do not change anything below
 #-------------------------------------------------------------------------------
@@ -19,23 +16,23 @@ export DISPLAY
       XORG_ARGS="$XORG_ARGS -ignoreABI"
       [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
 
-      progress "Found nVidia card, enabling binary driver as requested"
-        mkdir -p /var/lib
-          ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
-          ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
+      progress "Found nVidia card, enabling NVIDIA GLX as requested"
+        $IONICE mkdir -p /var/lib
+          $IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
+          $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
 
     else
 
-      progress "Not found nVidia card, enabling OSS driver as requested"
-        mkdir -p /var/lib
-          ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
-          ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
+      progress "Not found nVidia card, enabling Mesa GLX as requested"
+        $IONICE mkdir -p /var/lib
+          $IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
+          $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
     fi
 
     mkdir -p /var/cache/xkb
 
   # Make ICE directory
-    mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1
-    chown root:root /tmp/.ICE-unix
+    $IONICE mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1
+    $IONICE chown root:root /tmp/.ICE-unix
 
-    /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &
+    Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &