xorg-server:

- remove setting of $DISPLAY variable (done in configfile)
- enable fastboot support
This commit is contained in:
Stephan Raue 2010-03-08 00:08:21 +01:00
parent 0874e25b46
commit f95207880a

View File

@ -2,12 +2,9 @@
# #
# runlevels: openelec # runlevels: openelec
DISPLAY=':0.0'
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf" XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nolisten tcp" XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nolisten tcp"
export DISPLAY
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# do not change anything below # do not change anything below
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -19,23 +16,23 @@ export DISPLAY
XORG_ARGS="$XORG_ARGS -ignoreABI" XORG_ARGS="$XORG_ARGS -ignoreABI"
[ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF" [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
progress "Found nVidia card, enabling binary driver as requested" progress "Found nVidia card, enabling NVIDIA GLX as requested"
mkdir -p /var/lib $IONICE mkdir -p /var/lib
ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so $IONICE 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 $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
else else
progress "Not found nVidia card, enabling OSS driver as requested" progress "Not found nVidia card, enabling Mesa GLX as requested"
mkdir -p /var/lib $IONICE mkdir -p /var/lib
ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so $IONICE 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 $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
fi fi
mkdir -p /var/cache/xkb mkdir -p /var/cache/xkb
# Make ICE directory # Make ICE directory
mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1 $IONICE mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1
chown root:root /tmp/.ICE-unix $IONICE chown root:root /tmp/.ICE-unix
/usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 & Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &