From c3b91e179a0110d3d315b753a210f8ec7461bd06 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Mon, 15 Mar 2010 18:38:30 +0100
Subject: [PATCH] xorg-server: - configure xorg directories sooner

---
 .../xorg-server/init.d/05_configure_xorg      | 19 +++++++++++++
 .../xorg-server/init.d/12_configure-xorg      | 27 -------------------
 2 files changed, 19 insertions(+), 27 deletions(-)
 create mode 100755 packages/x11/xserver/xorg-server/init.d/05_configure_xorg
 delete mode 100644 packages/x11/xserver/xorg-server/init.d/12_configure-xorg

diff --git a/packages/x11/xserver/xorg-server/init.d/05_configure_xorg b/packages/x11/xserver/xorg-server/init.d/05_configure_xorg
new file mode 100755
index 0000000000..fc0f8efea6
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/init.d/05_configure_xorg
@@ -0,0 +1,19 @@
+#
+# configure xorg directories
+#
+# runlevels: openelec, text
+
+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
+  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
+  fi
diff --git a/packages/x11/xserver/xorg-server/init.d/12_configure-xorg b/packages/x11/xserver/xorg-server/init.d/12_configure-xorg
deleted file mode 100644
index 2adc464a53..0000000000
--- a/packages/x11/xserver/xorg-server/init.d/12_configure-xorg
+++ /dev/null
@@ -1,27 +0,0 @@
-# configure X.Org video settings
-#
-# runlevels: openelec, text, debug
-
-if lspci -n | grep 0300 | grep -q 10de; then
-
-  progress "Found nVidia card, loading NVidia driver"
-    $IONICE modprobe nvidia &
-
-  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 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
-
-# Make some needed directorys
-  $IONICE mkdir -p /var/cache/xkb
-  $IONICE mkdir -m 1777 -p /tmp/.ICE-unix
-  $IONICE chown root:root /tmp/.ICE-unix