From 2c7f8dd991dde577be58025e726033e2f531ecdc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Wed, 9 Dec 2009 14:03:17 +0100
Subject: [PATCH] xorg: - move xorg related functions from /etc/sysconfig to
 /etc/conf.d/xorg - cleanup /etc/conf.d/xorg - remove the default xorg cursor
 with -nocursor

---
 packages/sysutils/busybox/config/sysconfig   | 28 ---------------
 packages/x11/xserver/xorg-server/conf.d/xorg | 38 ++++++++++++++++----
 2 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/packages/sysutils/busybox/config/sysconfig b/packages/sysutils/busybox/config/sysconfig
index 89204fb673..f15c8ef350 100644
--- a/packages/sysutils/busybox/config/sysconfig
+++ b/packages/sysutils/busybox/config/sysconfig
@@ -17,34 +17,6 @@
     fi
   }
 
-  start_xorg() {
-    args="-s 0 -br -noreset -allowMouseOpenFail "
-
-    if lspci -n | grep 0300 | grep -q 10de; then
-      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
-    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
-    fi
-
-    mkdir -p /var/run
-      acpid 2>&1 > /dev/null
-
-    mkdir -p /var/cache/xkb
-      exec /usr/bin/Xorg :0.0 vt01 ${args} > /dev/null 2>&1 &
-  }
-
-  wait_for_xorg () {
-    while [ ! -f /tmp/.X0-lock ]; do
-      true
-    done
-  }
-
   wait_for_network () {
     while [ ! -f /var/run/connman/udhcpc.*.pid ]; do
       true
diff --git a/packages/x11/xserver/xorg-server/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg
index 74283ae3fa..666027d996 100644
--- a/packages/x11/xserver/xorg-server/conf.d/xorg
+++ b/packages/x11/xserver/xorg-server/conf.d/xorg
@@ -9,11 +9,37 @@
 # X environment variables.
 #-------------------------------------------------------------------------------
 DISPLAY=':0.0'
-TTY=1
-XINITRC='/usr/lib/X11/xinit/xinitrc'
-XSERVERRC='/usr/lib/X11/xinit/xserverrc'
+XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor"
 
 export DISPLAY
-export XINITRC
-export XSERVERRC
-export TTY
+
+#-------------------------------------------------------------------------------
+# do not change anything below
+#-------------------------------------------------------------------------------
+
+  start_xorg() {
+
+    if lspci -n | grep 0300 | grep -q 10de; then
+      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
+    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
+    fi
+
+    mkdir -p /var/run
+      acpid 2>&1 > /dev/null
+
+    mkdir -p /var/cache/xkb
+      exec /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &
+  }
+
+  wait_for_xorg () {
+    while [ ! -f /tmp/.X0-lock ]; do
+      true
+    done
+  }