summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-12-12 19:11:16 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-12-12 19:11:16 +0000
commit83585efc5c67410815f0716a65f6452cf0c30ed8 (patch)
treecd26eadf6d55cced1fcab45574bca1dc90dc9225 /src/livecd-tools
parentnew inserts (diff)
downloadgentoo-83585efc5c67410815f0716a65f6452cf0c30ed8.tar.gz
gentoo-83585efc5c67410815f0716a65f6452cf0c30ed8.tar.bz2
gentoo-83585efc5c67410815f0716a65f6452cf0c30ed8.zip
Cause Nvidia check to look for either NV or nv, in case of broken pci.ids file.
Diffstat (limited to 'src/livecd-tools')
-rw-r--r--src/livecd-tools/livecd-functions.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/livecd-tools/livecd-functions.sh b/src/livecd-tools/livecd-functions.sh
index 56fc38f7db..a7c988cab1 100644
--- a/src/livecd-tools/livecd-functions.sh
+++ b/src/livecd-tools/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