diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-12-22 16:27:29 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-12-22 16:27:29 (GMT) |
| commit | d09f1bd57aa7e8ece0c3a9c67215353fae0596d3 (patch) | |
| tree | 97d056f479915586f096750c3167d762ccf3ef25 /abs/core/LinHES-config/xconfig.sh | |
| parent | bdaf62a632a66c9267da8bfcbe3efefe1da52a8b (diff) | |
| download | linhes_pkgbuild-d09f1bd57aa7e8ece0c3a9c67215353fae0596d3.zip linhes_pkgbuild-d09f1bd57aa7e8ece0c3a9c67215353fae0596d3.tar.gz linhes_pkgbuild-d09f1bd57aa7e8ece0c3a9c67215353fae0596d3.tar.bz2 | |
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
Diffstat (limited to 'abs/core/LinHES-config/xconfig.sh')
| -rwxr-xr-x | abs/core/LinHES-config/xconfig.sh | 25 |
1 files changed, 15 insertions, 10 deletions
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" } |