diff options
| author | Volker Uhrig | 2008-09-16 20:26:58 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-09-16 20:26:58 +0200 |
| commit | 5ad4a2b0ee25a7993205e529fee5750a1e870209 (patch) | |
| tree | 3e6314995968b57cb5aff031d956e1336c144ca1 /os-plugins/plugins/xserver/XX_xserver.sh | |
| parent | * .. (diff) | |
| download | core-5ad4a2b0ee25a7993205e529fee5750a1e870209.tar.gz core-5ad4a2b0ee25a7993205e529fee5750a1e870209.tar.xz core-5ad4a2b0ee25a7993205e529fee5750a1e870209.zip | |
* modified linkingscript for ati and nvida modules
* added executation in stage1
* changes done with Bastian
* untested
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2226 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/xserver/XX_xserver.sh')
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index 4ca21287..b58b6e32 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -47,8 +47,8 @@ if [ -e /initramfs/plugin-conf/xserver.conf -a \ ###################################################################### set -x - if [ $(grep -i -m 1 'Driver Activation Cmd: "modprobe fglrx"' \ - /etc/hwinfo.data | wc -l) -eq "1" -a $xserver_prefnongpl -eq 1 ] + if [ $(grep -i -m 1 'fglrx' \ + /etc/hwinfo.data | wc -l) -ge "1" -a $xserver_prefnongpl -eq 1 ] then # we have an ati card here ATI=1 @@ -71,8 +71,8 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\," ${LINK_PATH}libGL.so.1.2 fi - if [ $(grep -i -m 1 'Driver Activation Cmd: "modprobe nvidia"' \ - /etc/hwinfo.data | wc -l) -eq "1" -a $xserver_prefnongpl -eq 1 ] + if [ $(grep -i -m 1 'nvidia' \ + /etc/hwinfo.data | wc -l) -ge "1" -a $xserver_prefnongpl -eq 1 ] then # we have an ati card here NVIDIA=1 @@ -239,7 +239,7 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents" size="$(grep -m 1 " Size: " /etc/hwinfo.display | \ sed 's|.*ize:\ ||;s|\ mm||;s|x|\ |')" modes=$(grep -i "Resolution: .*@" /etc/hwinfo.display | \ - awk '{print $2}'| sort -unr| awk -F '@' '{print "\"" $1 "\""}'|\ + awk '{print $2}'| awk -F '@' '{print "\"" $1 "\""}'| sort -unr| \ tr "\n" " ") [ -n "$vert" -a -n "$horz" ] && \ sed -e "s|# Horizsync.*| Horizsync $horz|;\ |