From ee2c4cba3681fd7e8ea33ac12c32999cd878c597 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Sun, 21 Mar 2010 15:44:25 +0100
Subject: [PATCH] uxlaunch: - create directorys for starting xorg here -
 specify xorg configfile based on detecte graphic adapter

---
 .../x11/other/uxlaunch/init.d/60_uxlaunch     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/x11/other/uxlaunch/init.d/60_uxlaunch b/packages/x11/other/uxlaunch/init.d/60_uxlaunch
index a31dfe9b0e..9a6c152514 100644
--- a/packages/x11/other/uxlaunch/init.d/60_uxlaunch
+++ b/packages/x11/other/uxlaunch/init.d/60_uxlaunch
@@ -6,6 +6,8 @@ progress "starting uxlaunch"
 
   UX_USER="root"
   UX_TTY="1"
+  XORG_CONF="/etc/X11/xorg.conf"
+  XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
 
   if [ "$START_MRXVT" = "yes" ]; then
     UX_SESSION="/usr/bin/mrxvt-session"
@@ -16,4 +18,23 @@ progress "starting uxlaunch"
   UX_ARG="-u $UX_USER -t $UX_TTY -s $UX_SESSION"
   [ "$DEBUG" = "yes" ] && UX_ARG="$UX_ARG -v"
 
+progress "creating directories needed for Xorg"
+
+  $IONICE mkdir -p /var/cache/xkb
+  $IONICE mkdir -p /var/lib
+  $IONICE mkdir -m 1777 -p /tmp/.ICE-unix
+  $IONICE chown root:root /tmp/.ICE-unix
+
+  if lspci -n | grep 0300 | grep -q 10de; then
+    $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
+    UX_ARG="$UX_ARG -c $XORG_NVIDIA_CONF"
+  else
+    $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
+    UX_ARG="$UX_ARG -c $XORG_CONF"
+  fi
+
+progress "starting xsession"
+
   uxlaunch $UX_ARG > /dev/null 2>&1
\ No newline at end of file