xorg-server: add support for driver based configfiles in /stoareg/.config, thanks to chewitt

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-06-27 13:11:01 +02:00
parent 74d4582b05
commit 634601f7f8

View File

@ -33,8 +33,9 @@ if [ "$RUNLEVEL" = openelec ]; then
logger -t Xorg "### setup xorg.conf paths ###" logger -t Xorg "### setup xorg.conf paths ###"
XORG_CONF_USER="/storage/.config/xorg.conf" 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_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 # creating start options
@ -51,10 +52,12 @@ if [ "$RUNLEVEL" = openelec ]; then
# load user defined xorg.conf, if exist # load user defined xorg.conf, if exist
if [ -f "$XORG_CONF_USER" ]; then if [ -f "$XORG_CONF_USER" ]; then
XORG_ARGS="$XORG_ARGS -config $XORG_CONF_USER" 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 elif [ -f "$XORG_CONF_DEFAULT" ]; then
XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DEFAULT" XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DEFAULT"
elif [ -f "$XORG_CONF_DRIVER" ]; then elif [ -f "$XORG_CONF_DEFAULT_DRV" ]; then
XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DRIVER" XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DEFAULT_DRV"
fi fi
############################################################################## ##############################################################################