diff options
| author | Dirk von Suchodoletz | 2006-11-20 02:27:07 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-11-20 02:27:07 +0100 |
| commit | a4325253b8b93b3a60a7cb9c3f045d4fb4d918dc (patch) | |
| tree | eadb68ac92318bd711d1e5155f4d69a71a0526ba /initramfs/initrd-stuff/bin/hwautocfg | |
| parent | Support for nvidia too, still to be checked. Disable parallel start of (diff) | |
| download | core-a4325253b8b93b3a60a7cb9c3f045d4fb4d918dc.tar.gz core-a4325253b8b93b3a60a7cb9c3f045d4fb4d918dc.tar.xz core-a4325253b8b93b3a60a7cb9c3f045d4fb4d918dc.zip | |
User specified data has priority, so switch of radeon->fglrx, nv->nvidia
should be tried earlier ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@516 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, 6 insertions, 4 deletions
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index ae591673..88076038 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -83,6 +83,12 @@ 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 DRV=${hw_graphic% *} CDP=${hw_graphic##* } @@ -126,10 +132,6 @@ 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" -checkgraphix - # finally write config file echo -e "#\n# autogenerated X hardware configuration by $0\n# \ OpenSLX.ORG Project <openslx-users@openslx.org>, $date" >$xfc |