From 634601f7f86249f2ab47df460d6e32a8eb9149b3 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 27 Jun 2011 13:11:01 +0200
Subject: [PATCH] xorg-server: add support for driver based configfiles in
 /stoareg/.config, thanks to chewitt

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/xserver/xorg-server/scripts/xorg_start | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start
index 8d38758750..c971eec77c 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg_start
+++ b/packages/x11/xserver/xorg-server/scripts/xorg_start
@@ -33,8 +33,9 @@ if [ "$RUNLEVEL" = openelec ]; then
   logger -t Xorg "### setup xorg.conf paths ###"
 
   XORG_CONF_USER="/storage/.config/xorg.conf"
+  XORG_CONF_USER_DRV="/storage/.config/xorg-${xorg_driver}.conf"
   XORG_CONF_DEFAULT="/etc/X11/xorg.conf"
-  XORG_CONF_DRIVER="/etc/X11/xorg-${xorg_driver}.conf"
+  XORG_CONF_DEFAULT_DRV="/etc/X11/xorg-${xorg_driver}.conf"
 
   ##############################################################################
   # creating start options
@@ -51,10 +52,12 @@ if [ "$RUNLEVEL" = openelec ]; then
   # load user defined xorg.conf, if exist
   if [ -f "$XORG_CONF_USER" ]; then
     XORG_ARGS="$XORG_ARGS -config $XORG_CONF_USER"
+  elif [ -f "$XORG_CONF_USER_DRV" ]; then
+    XORG_ARGS="$XORG_ARGS -config $XORG_CONF_USER_DRV"
   elif [ -f "$XORG_CONF_DEFAULT" ]; then
     XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DEFAULT"
-  elif [ -f "$XORG_CONF_DRIVER" ]; then
-    XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DRIVER"
+  elif [ -f "$XORG_CONF_DEFAULT_DRV" ]; then
+    XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DEFAULT_DRV"
   fi
 
   ##############################################################################