diff options
| author | Bastian Wissler | 2008-10-28 16:37:30 +0100 |
|---|---|---|
| committer | Bastian Wissler | 2008-10-28 16:37:30 +0100 |
| commit | f4f96ea1ec65880ff095847546d97f4af30422c8 (patch) | |
| tree | 5fd2e91bdd5fa096d3bc5c910b6b3c478e62ed73 /os-plugins | |
| parent | xserver: * one additional link to XX_xserver.sh (diff) | |
| download | core-f4f96ea1ec65880ff095847546d97f4af30422c8.tar.gz core-f4f96ea1ec65880ff095847546d97f4af30422c8.tar.xz core-f4f96ea1ec65880ff095847546d97f4af30422c8.zip | |
xserver: * Some changes to XX_xserver.sh
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2376 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index aad3b6d1..d026e0d8 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -229,7 +229,7 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents" # setup the matching OpenGL, DRI libraries depending on choosen driver # type (mesa/gpl, fglrx, nvidia, (matrox)). We should not see nvidia, # fglrx here if xserver_prefnongpl is set to "0" - if $(grep -q -iE ".*Driver.*fglrx.*" $xfc); then + if [ "${xmodule}" = "fglrx" ]; then DRILPATH=/mnt/var/X11R6/lib/usr/X11R6/lib/modules/dri/ testmkd "${DRILPATH}" ln -fs ${PLUGIN_ROOTFS}/usr/lib/dri/fglrx_dri.so ${DRILPATH}/fglrx_dri.so @@ -241,7 +241,7 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents" chroot /mnt /sbin/insmod ${PLUGIN_ROOTFS}/modules/fglrx.ko # we need some pci.ids for fglrx driver cp -r "${PLUGIN_PATH}/etc/ati" /mnt/etc - elif $(grep -q -iE ".*Driver.*nvidia.*" $xfc); then + elif [ "${xmodule}" = "nvidia" ]; then # create all relevant libGL links # this is the most important thing ln -sf ${PLUGIN_ROOTFS}/usr/lib/libGLcore.so.1 \ @@ -253,7 +253,8 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents" ln -sf ${PLUGIN_ROOTFS}/usr/lib/libGL.so.1 ${glliblinks}/libGL.so.1 ln -sf ${PLUGIN_ROOTFS}/usr/lib/libGL.so.1 ${glliblinks}/libGL.so.1.2 else - if [ -e /usr/lib/libGL_MESA.1.2 ]; then + if [ -e /mnt/usr/lib/libGL_MESA.1.2 ]; then + ## TODO: Somehow this is never true ??? ln -sf /usr/lib/libGL_MESA.so.1.2 /mnt/var/X11R6/lib/libGL.so ln -sf /usr/lib/libGL_MESA.so.1.2 /mnt/var/X11R6/lib/libGL.so.1 ln -sf /usr/lib/libGL_MESA.so.1.2 /mnt/var/X11R6/lib/libGL.so.1.2 |