summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-11-13 21:57:28 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-11-13 21:57:28 +0000
commitf5fec1f57d6d017e81b45d48bb264f4633e0c382 (patch)
tree782eaea910ea870c1f952c0803f3cb35dae1aef3 /livecd-functions.sh
parentMade x86 matching line more concise. (diff)
downloadlivecd-tools-f5fec1f57d6d017e81b45d48bb264f4633e0c382.tar.gz
livecd-tools-f5fec1f57d6d017e81b45d48bb264f4633e0c382.tar.bz2
livecd-tools-f5fec1f57d6d017e81b45d48bb264f4633e0c382.zip
Updated nVidia card detection for bug #111509.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@84 7bf51bff-881f-0410-a643-fba68b97345e
Diffstat (limited to 'livecd-functions.sh')
-rwxr-xr-xlivecd-functions.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/livecd-functions.sh b/livecd-functions.sh
index f4919af..5a7d54b 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.13 2005/08/16 19:02:33 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/livecd-tools/livecd-functions.sh,v 1.14 2005/11/13 21:57:28 wolf31o2 Exp $
# Global Variables:
# CDBOOT -- is booting off CD
@@ -55,7 +55,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}')
+ NVIDIA_CARD=$(echo ${NVIDIA} | awk 'BEGIN {RS=" "} /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