diff options
| author | Root | 2006-11-20 22:38:16 +0100 |
|---|---|---|
| committer | Root | 2006-11-20 22:38:16 +0100 |
| commit | afd3110d508c49929aa04713316ac802c2adb04a (patch) | |
| tree | 54381cc42f57d49608f2d0f57857c543d5f4e3ef /initramfs/initrd-stuff/bin/hwautocfg | |
| parent | User specified data has priority, so switch of radeon->fglrx, nv->nvidia (diff) | |
| download | core-afd3110d508c49929aa04713316ac802c2adb04a.tar.gz core-afd3110d508c49929aa04713316ac802c2adb04a.tar.xz core-afd3110d508c49929aa04713316ac802c2adb04a.zip | |
NVidia should work accelerated too (SuSE10.1 only, see #42) ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@517 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/bin/hwautocfg')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index 88076038..75ce2381 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -3,7 +3,7 @@ # universal (distro independent) hardware autoconfiguration script for # OpenSLX linux diskless clients, using hwconfig from knoppix as base tool # -# Dirk von Suchodoletz <dvs@OpenSLX.com>, 07-11-2006 +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 20-11-2006 # # (c) 2003 - 2006 - RZ Universitaet Freiburg # (c) 2006 - OpenSLX.org Project @@ -83,10 +83,6 @@ local DRI='\tGroup\t\t"video"\n # displayvars may overwrite the above settings displayvars -# check for special X driver (fglrx, nvidia, ...) and enable tvout if variable -# tvout is not "no" -checkgraphix - # check if hardware definition variables are set and overwrite autodetected # values if [ -n "$hw_graphic" ] ; then @@ -132,6 +128,10 @@ if [ -z "$SCR_MODES" ] ; then #error "$hcfg_res" nonfatal fi monmanual=yes +# check for special X driver (fglrx, nvidia, ...) and enable tvout if variable +# tvout is not "no" +[ -z "$hw_graphic" ] && checkgraphix + # finally write config file echo -e "#\n# autogenerated X hardware configuration by $0\n# \ OpenSLX.ORG Project <openslx-users@openslx.org>, $date" >$xfc |