jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

uxlaunch:

Browse Source 
- adding support for user-created xorg.conf in /storage/.config (overrides the system xorg.conf)
This commit is contained in:
Stephan Raue 2010-04-15 01:46:20 +02:00
parent 929afb369c
commit ed641da24d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/x11/other/uxlaunch/init.d/60_uxlaunch
View File

@ -6,8 +6,9 @@ progress "starting uxlaunch"
UX_USER="root" UX_USER="root"
UX_TTY="1" UX_TTY="1"
XORG_CONF="/etc/X11/xorg.conf" XORG_DEFAULT_CONF="/etc/X11/xorg.conf"
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf" XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
XORG_USER_CONF="/storage/.config/xorg.conf"
if [ "$START_MRXVT" = "yes" -a -f /usr/bin/mrxvt-session ]; then if [ "$START_MRXVT" = "yes" -a -f /usr/bin/mrxvt-session ]; then
UX_SESSION="/usr/bin/mrxvt-session" UX_SESSION="/usr/bin/mrxvt-session"
@ -28,13 +29,16 @@ progress "creating directories needed for Xorg"
if lspci -n | grep 0300 | grep -q 10de; then 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/libGL_nvidia.so.1 /var/lib/libGL.so
$IONICE 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
UX_ARG="$UX_ARG -c $XORG_NVIDIA_CONF" XORG_CONF="$XORG_NVIDIA_CONF"
else else
$IONICE 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
$IONICE 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
UX_ARG="$UX_ARG -c $XORG_CONF" XORG_CONF="$XORG_DEFAULT_CONF"
fi fi
[ -f $XORG_USER_CONF ] && XORG_CONF="$XORG_USER_CONF"
UX_ARG="$UX_ARG -c $XORG_CONF"
progress "starting xsession" progress "starting xsession"
uxlaunch $UX_ARG > /dev/null 2>&1 uxlaunch $UX_ARG > /dev/null 2>&1