xorg-server: prefer /etc/X11/xorg.conf over /etc/X11/xorg-$DRIVER.conf

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-05-13 12:41:55 +02:00
parent 32c57462ea
commit 0c53cbcff6

View File

@ -32,9 +32,9 @@ if [ "$RUNLEVEL" = openelec ]; then
logger -t Xorg "### setup xorg.conf paths ###"
XORG_CONF_USER="/storage/.config/xorg.conf"
XORG_CONF_DEFAULT="/etc/X11/xorg.conf"
XORG_CONF_DRIVER="/etc/X11/xorg-${xorg_driver}.conf"
XORG_CONF_USER="/storage/.config/xorg.conf"
##############################################################################
# creating start options
@ -51,10 +51,10 @@ 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_DRIVER" ]; then
XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DRIVER"
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"
fi
##############################################################################