diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-12-05 23:06:34 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-12-05 23:06:34 +0000 |
| commit | 5a7cbe5bbc69d1d34129dbf869b126cfae3dd873 (patch) | |
| tree | 98ec583e13b5f252c1b17050275997ca98d489f9 /livecd-functions.sh | |
| parent | Removed ALSA warnings, as it will appear on all minimal InstallCD and will ca... (diff) | |
| download | livecd-tools-5a7cbe5bbc69d1d34129dbf869b126cfae3dd873.tar.gz livecd-tools-5a7cbe5bbc69d1d34129dbf869b126cfae3dd873.tar.bz2 livecd-tools-5a7cbe5bbc69d1d34129dbf869b126cfae3dd873.zip | |
Added 2 bug fixes from bug #114561.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@87 7bf51bff-881f-0410-a643-fba68b97345e
Diffstat (limited to 'livecd-functions.sh')
| -rwxr-xr-x | livecd-functions.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/livecd-functions.sh b/livecd-functions.sh index ac1b55e..56fc38f 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.15 2005/11/16 15:26:32 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/livecd-tools/livecd-functions.sh,v 1.16 2005/12/05 23:06:34 wolf31o2 Exp $ # Global Variables: # CDBOOT -- is booting off CD @@ -55,13 +55,14 @@ nv_gl() { } get_video_cards() { - VIDEO_CARDS="$(/sbin/lspci | grep VGA)" + [ -x /sbin/lspci ] && VIDEO_CARDS="$(/sbin/lspci | grep VGA)" + [ -x /usr/sbin/lspci ] && VIDEO_CARDS="$(/usr/sbin/lspci | grep VGA)" NUM_CARDS="$(echo ${VIDEO_CARDS} | wc -l)" if [ ${NUM_CARDS} -eq 1 ]; then 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[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 |