/[livecd-tools]/trunk/x-setup
Gentoo

Diff of /trunk/x-setup

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 39 Revision 41
1#!/bin/bash 1#!/bin/bash
2# Copyright 1999-2004 Gentoo Technologies, Inc. 2# Copyright 1999-2004 Gentoo Technologies, Inc.
3# Distributed under the terms of the GNU General Public License v2 3# Distributed under the terms of the GNU General Public License v2
4# $Header: /var/cvsroot/gentoo/src/livecd-tools/x-setup,v 1.9 2005/02/11 00:51:43 wolf31o2 Exp $ 4# $Header: /var/cvsroot/gentoo/src/livecd-tools/x-setup,v 1.10 2005/02/17 13:45:22 wolf31o2 Exp $
5 5
6# Check for an xorg.conf 6# Check for an xorg.conf
7if [ ! -e /etc/X11/xorg.conf ] 7if [ ! -e /etc/X11/xorg.conf ]
8then 8then
9 echo "ERROR: /etc/X11/xorg.conf cannot be found! Exiting" 9 echo "ERROR: /etc/X11/xorg.conf cannot be found! Exiting"
25 25
26get_video_cards() { 26get_video_cards() {
27 VIDEO_CARDS=`/sbin/lspci | grep VGA` 27 VIDEO_CARDS=`/sbin/lspci | grep VGA`
28 NUM_CARDS=`echo ${VIDEO_CARDS} | wc -l` 28 NUM_CARDS=`echo ${VIDEO_CARDS} | wc -l`
29 if [ ${NUM_CARDS} -eq 1 ]; then 29 if [ ${NUM_CARDS} -eq 1 ]; then
30 NVIDIA=`echo ${VIDEO_CARDS} | grep NV` 30 NVIDIA=`echo ${VIDEO_CARDS} | grep "nVidia Corporation"`
31 ATI=`echo ${VIDEO_CARDS} | grep "ATI Technologies"` 31 ATI=`echo ${VIDEO_CARDS} | grep "ATI Technologies"`
32 if [ -n "${NVIDIA}" ]; then 32 if [ -n "${NVIDIA}" ]; then
33 NVIDIA_CARD=`echo ${NVIDIA} | awk 'BEGIN {RS=" "} /NV[0-9]+/ {print $1}'` 33 NVIDIA_CARD=`echo ${NVIDIA} | awk 'BEGIN {RS=" "} /NV[0-9]+/ {print $1}'`
34 if [ -n "${NVIDIA_CARD}" ]; then
34 if [ `echo ${NVIDIA_CARD} | cut -dV -f2` -ge 4 ]; then 35 if [ `echo ${NVIDIA_CARD} | cut -dV -f2` -ge 4 ]; then
35 echo "NVIDIA card detected." 36 echo "NVIDIA card detected."
36 GLTYPE=nvidia 37 GLTYPE=nvidia
38 else
39 echo "No OpenGL-capable card found."
40 GLTYPE=xorg-x11
41 fi
37 else 42 else
38 echo "No OpenGL-capable card found." 43 echo "No OpenGL-capable card found."
39 GLTYPE=xorg-x11 44 GLTYPE=xorg-x11
40 fi 45 fi
41 elif [ -n "${ATI}" ]; then 46 elif [ -n "${ATI}" ]; then
42 ATI_CARD=`echo ${ATI} | awk 'BEGIN {RS=" "} /(R|RV|RS)\d{3}/ {print $1}'` 47 ATI_CARD=`echo ${ATI} | awk 'BEGIN {RS=" "} /(R|RV|RS)\d{3}/ {print $1}'`
48 if [ -n "${ATI_CARD}" ]; then
43 if [ `echo ${ATI_CARD} | cut -dS -f2` -ge 350 ] || \ 49 if [ `echo ${ATI_CARD} | cut -dS -f2` -ge 350 ] || \
44 [ `echo ${ATI_CARD} | cut -dV -f2` -ge 250 ] || \ 50 [ `echo ${ATI_CARD} | cut -dV -f2` -ge 250 ] || \
45 [ `echo ${ATI_CARD} | cut -dR -f2` -ge 200 ]; then 51 [ `echo ${ATI_CARD} | cut -dR -f2` -ge 200 ]; then
46 echo "ATI card detected." 52 echo "ATI card detected."
47 GLTYPE=ati 53 GLTYPE=ati
54 else
55 echo "No OpenGL-capable card found."
56 GLTYPE=xorg-x11
57 fi
48 else 58 else
49 echo "No OpenGL-capable card found." 59 echo "No OpenGL-capable card found."
50 GLTYPE=xorg-x11 60 GLTYPE=xorg-x11
51 fi 61 fi
52 else 62 else

Legend:
Removed from v.39  
changed lines
  Added in v.41

  ViewVC Help
Powered by ViewVC 1.1.20