From d09f1bd57aa7e8ece0c3a9c67215353fae0596d3 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 22 Dec 2012 10:27:29 -0600
Subject: LinHES-config: allow forcing of vga card type on the command line.
VGACARDTYPE="intel" xconfig.sh
VGACARDTYPE="nvidia" xconfig.sh
VGACARDTYPE="VMware" xconfig.sh
VGACARDTYPE="vesa" xconfig.sh
refs #888
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/xconfig.sh | 25 +++++++++++++++----------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 9b2437c..bd6b387 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=201
+pkgrel=202
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -140,7 +140,7 @@ md5sums=('26e20dba8d1bea96a07131ef945fd2f7'
'408688e3bcb2cefe512f9a89863137c8'
'2a7f3b34e522acfd08283b86c8926aba'
'b596d2e3779a434435bc0f0277b1ba3e'
- '31c01f0d5be8ded8a3c24224ee37841a'
+ '5012fbd31d205a6d6b0a1d8caf3eba8f'
'b02bc06fc6623bf6473175165578e1d5'
'a6faa20d905e2fd92ce79acab044b759'
'8ba06c2ce6129371548cc360ccca27f8'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index 2a83506..eda67b4 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -21,18 +21,23 @@ home_check
function Xvalues {
- CMDLINE=$(cat /proc/cmdline)
- echo "$CMDLINE" | grep -q forceXvesa
- if [ $? = 0 ]
+ if [ "x$VGACARDTYPE" = "x" ]
then
- echo "Forcing driver to vesa"
- VGACARDTYPE=vesa
- Xcardtype=$VGACARDTYPE
+ CMDLINE=$(cat /proc/cmdline)
+ echo "$CMDLINE" | grep -q forceXvesa
+ if [ $? = 0 ]
+ then
+ echo "Forcing driver to vesa"
+ VGACARDTYPE=vesa
+ Xcardtype=$VGACARDTYPE
+ else
+ VGACARDTYPE=`lspci | grep -i vga | grep -vi non-vga| sort -r | head -n 1 | cut -d: -f3 | cut -d" " -f2`
+ VGAPCIID=`lspci | grep -i vga |grep -vi non-vga| sort -r | head -n 1 | cut -d" " -f1`
+ CARDID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f2`
+ VENDORID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f1`
+ fi
else
- VGACARDTYPE=`lspci | grep -i vga | sort -r | head -n 1 | cut -d: -f3 | cut -d" " -f2`
- VGAPCIID=`lspci | grep -i vga | sort -r | head -n 1 | cut -d" " -f1`
- CARDID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f2`
- VENDORID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f1`
+ echo "VGACARDTYPE already set"
fi
echo "Detected $VGACARDTYPE as the video card type"
}
--
cgit v0.12