diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-12-12 19:11:16 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-12-12 19:11:16 +0000 |
| commit | 66db07771f25c0fab3ed75855c6665ef64029212 (patch) | |
| tree | 33fc58dd374a632fe84eb3ba5f40373665b738f4 /livecd-functions.sh | |
| parent | Added 2 bug fixes from bug #114561. (diff) | |
| download | livecd-tools-66db07771f25c0fab3ed75855c6665ef64029212.tar.gz livecd-tools-66db07771f25c0fab3ed75855c6665ef64029212.tar.bz2 livecd-tools-66db07771f25c0fab3ed75855c6665ef64029212.zip | |
Cause Nvidia check to look for either NV or nv, in case of broken pci.ids file.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@88 7bf51bff-881f-0410-a643-fba68b97345e
Diffstat (limited to 'livecd-functions.sh')
| -rwxr-xr-x | livecd-functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/livecd-functions.sh b/livecd-functions.sh index 56fc38f..a7c988c 100755 --- a/livecd-functions.sh +++ b/livecd-functions.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/livecd-tools/livecd-functions.sh,v 1.16 2005/12/05 23:06:34 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/livecd-tools/livecd-functions.sh,v 1.17 2005/12/12 19:11:16 wolf31o2 Exp $ # Global Variables: # CDBOOT -- is booting off CD @@ -62,7 +62,7 @@ get_video_cards() { NVIDIA=$(echo ${VIDEO_CARDS} | grep "nVidia Corporation") ATI=$(echo ${VIDEO_CARDS} | grep "ATI Technologies") if [ -n "${NVIDIA}" ]; then - NVIDIA_CARD=$(echo ${NVIDIA} | awk 'BEGIN {RS=" "} /NV[0-9]+/ {print $1}' | cut -d. -f1 | sed 's/ //' | sed 's:[^0-9]::g') + NVIDIA_CARD=$(echo ${NVIDIA} | awk 'BEGIN {RS=" "} /(NV|nv)[0-9]+/ {print $1}' | cut -d. -f1 | sed 's/ //' | sed 's:[^0-9]::g') if [ -n "${NVIDIA_CARD}" ]; then if [ $(echo ${NVIDIA_CARD} | cut -dV -f2) -ge 4 ]; then nv_gl |