Hardware detection, list handling not optimal; we need a good source for

that (Gentoo!?) ...



git-svn-id: http://svn.openslx.org/svn/openslx/trunk@742 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 113 insertions, 5 deletions

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 08c36931..778c15aa 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -508,10 +508,10 @@ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \
   esac
   echo -e "# entry made by $0 $date\n$init" >> /mnt/etc/inittab
   # most probably not needed any longer
-  #if [ -n ${D_XORGBIN} ] ; then
-  #  testmkd /mnt/var/X11R6/bin
-  #  ln -sf ${D_XORGBIN} /mnt/var/X11R6/bin/X
-  #fi
+  if [ -n ${D_XORGBIN} ] ; then
+    testmkd /mnt/var/X11R6/bin
+    ln -sf ${D_XORGBIN} /mnt/var/X11R6/bin/X
+  fi
 fi
 
 # setup requested display manager
diff --git a/initramfs/initrd-stuff/usr/share/hwdata/Cards b/initramfs/initrd-stuff/usr/share/hwdata/Cards
index 05b9df6b..69ddcc40 100644
--- a/initramfs/initrd-stuff/usr/share/hwdata/Cards
+++ b/initramfs/initrd-stuff/usr/share/hwdata/Cards
@@ -1948,6 +1948,9 @@ NAME ATI Radeon (generic)
 CHIPSET R100
 DRIVER radeon
 
+NAME ATI Radeon
+SEE ATI Radeon (generic)
+
 NAME ATI Radeon AGP
 SEE ATI Radeon (generic)
 
@@ -3385,6 +3388,9 @@ CHIPSET Quadro FX
 DRIVER nv
 NOCLOCKPROBE
 
+NAME NVIDIA GeForce 6 Series
+SEE NVIDIA GeForce 6100
+
 NAME NVIDIA GeForce 6100
 DRIVER nv
 NOCLOCKPROBE
diff --git a/initramfs/initrd-stuff/usr/share/hwdata/pcitable b/initramfs/initrd-stuff/usr/share/hwdata/pcitable
index 2ecaeec6..d51ae630 100644
--- a/initramfs/initrd-stuff/usr/share/hwdata/pcitable
+++ b/initramfs/initrd-stuff/usr/share/hwdata/pcitable
@@ -277,9 +277,84 @@
 0x1002	0x5655	"Card:ATI Mach64 VT (264VT)"	"ATI|264VT3 [Mach64 VT3]"
 0x1002	0x5656	"Card:ATI Mach64 VT (264VT)"	"ATI|264VT4 [Mach64 VT4]"
 0x1002	0x5961	"Card:ATI Radeon 9200"	"ATI|Radeon RV280 [Radeon 9200]"
+0x1002  0x5964  "Card:ATI Radeon"       "ATI Technologies Inc.|Radeon RV280"
 0x1002  0x5974  "Card:ATI Radeon RS482"
+0x1002  0x5975  "Card:ATI Radeon"       "ATI Technologies Inc|RS482 [Radeon Xpress 200M]"
+0x1002  0x5a34  "unknown"       "ATI Technologies Inc.|RS480 PCI-X Root Port"
+0x1002  0x5a36  "unknown"       "ATI Technologies Inc|RS480 PCI Bridge"
+0x1002  0x5a38  "unknown"       "ATI Technologies Inc|RS480 PCI Bridge"
+0x1002  0x5a39  "unknown"       "ATI Technologies Inc|RS480 PCI Bridge"
+0x1002  0x5a3f  "unknown"       "ATI Technologies Inc|RS480 PCI Bridge"
+0x1002  0x5a41  "Card:ATI Radeon"       "ATI Technologies Inc|RS400 [Radeon Xpress 200]"
+0x1002  0x5a42  "Card:ATI Radeon"       "ATI Technologies Inc|RS400 [Radeon Xpress 200M]"
+0x1002  0x5a61  "Card:ATI Radeon"       "ATI Technologies Inc|RC410 [Radeon Xpress 200]"
+0x1002  0x5a62  "Card:ATI Radeon"       "ATI Technologies Inc|RC410 [Radeon Xpress 200M]"
+0x1002  0x5b60  "Card:ATI Radeon"       "ATI Technologies Inc.|Radeon RV370"
+0x1002  0x5b62  "Card:ATI Radeon"       "ATI Technologies Inc.|RV370 Radeon X600 (PCI-E)"
+0x1002  0x5b63  "Card:ATI Radeon"       "ATI Technologies Inc|RV370 [ATI Sapphire X550 Silent]"
+0x1002  0x5b64  "Card:ATI Radeon"       "ATI Technologies Inc.|RV370 GL Radeon"
+0x1002  0x5b65  "Card:ATI Radeon"       "ATI Technologies Inc.|RV370 FireGL D1100 (PCI-E)"
+0x1002  0x5b70  "Card:ATI Radeon"       "ATI Technologies Inc.|Radeon RV370"
+0x1002  0x5b72  "unknown"       "ATI Technologies Inc.|Radeon X600(RV380)"
+0x1002  0x5b73  "unknown"       "ATI Technologies Inc|RV370 secondary [ATI Sapphire X550 Silent]"
+0x1002  0x5b74  "Card:ATI Radeon"       "ATI Technologies Inc.|Radeon RV370 GL (Secondary)"
+0x1002  0x5c61  "Card:ATI Radeon"       "ATI Technologies Inc.|Radeon Mobility 9200 (M9+) 5C61 (AGP)"
+0x1002  0x5c62  "Card:ATI Radeon"       "ATI Technologies Inc.|Radeon RV280"
+0x1002  0x5c63  "Card:ATI Radeon"       "ATI Technologies Inc.|Radeon Mobility 9200 (M9+) 5C63 (AGP)"
+0x1002  0x5c64  "Card:ATI Radeon"       "ATI Technologies Inc.|Radeon RV280"
+0x1002  0x5d44  "unknown"       "ATI Technologies Inc.|RV280 Radeon 9200 SE Series - Secondary"
+0x1002  0x5d48  "Card:ATI Radeon"       "ATI Technologies Inc|M28 [Radeon Mobility X800XT]"
+0x1002  0x5d49  "Card:ATI Radeon"       "ATI Technologies Inc|M28 [Mobility FireGL V5100]"
+0x1002  0x5d4a  "Card:ATI Radeon"       "ATI Technologies Inc.|Mobility Radeon X800"
+0x1002  0x5d4d  "Card:ATI Radeon"       "ATI Technologies Inc.|R480 Radeon X850XT Platinum"
+0x1002  0x5d4f  "Card:ATI Radeon"       "ATI Technologies Inc|R480 [Radeon X800 GTO (PCIE)]"
+0x1002  0x5d52  "Card:ATI Radeon"       "ATI Technologies Inc.|R480 Radeon X850XT (PCI-E) (Primary)"
+0x1002  0x5d57  "Card:ATI Radeon"       "ATI Technologies Inc.|R423 Radeon X800XT (PCI-E)"
+0x1002  0x5d6d  "unknown"       "ATI Technologies Inc.|R480 Radeon X850XT Platinum (PCI-E) (Secondary)"
+0x1002  0x5d6f  "unknown"       "ATI Technologies Inc|R480 [Radeon X800 GTO (PCIE)] (Secondary)"
+0x1002  0x5d72  "unknown"       "ATI Technologies Inc.|R480 Radeon X850XT (PCI-E)"
+0x1002  0x5d77  "unknown"       "ATI Technologies Inc.|R423 Radeon X800XT (PCI-E) (Secondary)"
+0x1002  0x5e48  "Card:ATI Radeon"       "ATI Technologies Inc|RV410 [FireGL V5000]"
+0x1002  0x5e49  "unknown"       "ATI Technologies Inc|RV410 [FireGL V3300]"
+0x1002  0x5e4a  "Card:ATI Radeon"       "ATI Technologies Inc|RV410 [Radeon X700XT]"
+0x1002  0x5e4b  "Card:ATI Radeon"       "ATI Technologies Inc.|RV410 Radeon X700 Pro (PCI-E)"
+0x1002  0x5e4c  "Card:ATI Radeon"       "ATI Technologies Inc|RV410 [Radeon X700SE]"
+0x1002  0x5e4c  "Card:ATI Radeon"       "ATI Technologies Inc|RV410 [Radeon X700SE]"
+0x1002  0x5e4d  "Card:ATI Radeon"       "ATI Technologies Inc.|RV410 Radeon X700 (PCI-E)"
+0x1002  0x5e4f  "Card:ATI Radeon"       "ATI Technologies Inc|RV410 [Radeon X700]"
+0x1002  0x5e6b  "Card:ATI Radeon"       "ATI Technologies Inc.|RV410 Radeon X700 Pro (PCI-E) (Secondary)"
 0x1002	0x700f	"unknown"	"ATI|PCI Bridge [IGP 320M]"
 0x1002	0x7010	"unknown"	"ATI|PCI Bridge [IGP 340M]"
+0x1002  0x7100  "unknown"       "ATI Technologies Inc|R520 [Radeon X1800]"
+0x1002  0x7105  "unknown"       "ATI Technologies Inc|R520 [FireGL]"
+0x1002  0x7109  "unknown"       "ATI Technologies Inc|R520 [Radeon X900]"
+0x1002  0x7120  "unknown"       "ATI Technologies Inc|R520 [Radeon X1800] (Secondary)"
+0x1002  0x7129  "unknown"       "ATI Technologies Inc|R520 [Radeon X1800] (Secondary)"
+0x1002  0x7142  "unknown"       "ATI Technologies Inc|RV515 [Radeon X1300]"
+0x1002  0x7145  "unknown"       "ATI Technologies Inc|Radeon Mobility X1400"
+0x1002  0x7146  "unknown"       "ATI Technologies Inc|RV515 [Radeon X1300]"
+0x1002  0x7149  "unknown"       "ATI Technologies Inc|M52 [ATI Mobility Radeon X1300]"
+0x1002  0x714a  "unknown"       "ATI Technologies Inc|M52 [ATI Mobility Radeon X1300]"
+0x1002  0x714b  "unknown"       "ATI Technologies Inc|M52 [ATI Mobility Radeon X1300]"
+0x1002  0x714c  "unknown"       "ATI Technologies Inc|M52 [ATI Mobility Radeon X1300]"
+0x1002  0x7162  "unknown"       "ATI Technologies Inc|RV515 [Radeon X1300] (Secondary)"
+0x1002  0x7166  "unknown"       "ATI Technologies Inc|RV515 [Radeon X1300] (Secondary)"
+0x1002  0x71c0  "unknown"       "ATI Technologies Inc|RV530 [Radeon X1600]"
+0x1002  0x71c2  "unknown"       "ATI Technologies Inc|RV530 [Radeon X1600]"
+0x1002  0x71c4  "unknown"       "ATI Technologies Inc|M56GL [ATI Mobility FireGL V5200]"
+0x1002  0x71c5  "unknown"       "ATI Technologies Inc|M56P [Radeon Mobility X1600]"
+0x1002  0x71e0  "unknown"       "ATI Technologies Inc|RV530 [Radeon X1600] (Secondary)"
+0x1002  0x71e2  "unknown"       "ATI Technologies Inc|RV530 [Radeon X1600] (Secondary)"
+0x1002  0x7800  "unknown"       "ATI Technologies Inc.| "
+0x1002  0x7833  "unknown"       "ATI Technologies Inc.|Radeon 9100 IGP Host Bridge"
+0x1002  0x7834  "Card:ATI Radeon (fglrx)"       "ATI Technologies Inc.|Radeon 9000 XT IGP (AGP)"
+0x1002  0x7838  "unknown"       "ATI Technologies Inc.|Radeon 9100 IGP PCI/AGP Bridge"
+0x1002  0x7c37  "unknown"       "ATI Technologies Inc.|RV350 AQ Radeon 9600 SE"
+0x1002  0xcab0  "ati-agp"       "ATI Technologies Inc.|CPU to PCI Bridge"
+0x1002  0xcab1  "unknown"       "ATI Technologies Inc.|A3/U1 Slot1 CPU to PCI Bridge"
+0x1002  0xcab2  "ati-agp"       "ATI Technologies Inc.|RS200/RS200M AGP Bridge [IGP 340M]"
+0x1002  0xcab3  "ati-agp"       "ATI Technologies Inc.|RS250/RS250M AGP Bridge"
+0x1002  0xcbb2  "ati-agp"       "ATI Technologies Inc.|CPU to PCI Bridge"
 0x1002	0xcab0	"unknown"	"ATI|AGP Bridge [IGP 320M]"
 0x1002	0xcab2	"unknown"	"ATI|RS200/RS200M AGP Bridge [IGP 340M]"
 0x1003	0x0201	"unknown"	"ULSI Systems|US201"
@@ -1575,7 +1650,34 @@
 0x10de	0x0201	"Card:NVIDIA GeForce 3 (generic)"	"nVidia Corporation|NV20 [GeForce3 Ti 200]"
 0x10de	0x0202	"Card:NVIDIA GeForce 3 (generic)"	"nVidia Corporation|NV20 [GeForce3 Ti 500]"
 0x10de	0x0203	"Card:NVIDIA GeForce 2 MX (generic)"	"nVidia Corporation|NV20DCC [Quadro DCC]"
-0x10de  0x0242  "Card:NVIDIA Geforce 6100"
+0x10de  0x0210  "Card:NVIDIA GeForce"   "nVidia Corp.|Unknown (generic)"
+0x10de  0x0211  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|GeForce 6800"
+0x10de  0x0212  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|GeForce 6800 LE"
+0x10de  0x0215  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|GeForce 6800 GT"
+0x10de  0x0218  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|GeForce 6800 XT"
+0x10de  0x021d  "Card:NVIDIA GeForce"   "nVidia Corp.|Unknown (generic)"
+0x10de  0x021e  "Card:NVIDIA GeForce"   "nVidia Corp.|Unknown (generic)"
+0x10de  0x0220  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|"
+0x10de  0x0221  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|GeForce 6200"
+0x10de  0x0222  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|"
+0x10de  0x0228  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|"
+0x10de  0x0240  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|C51PV [GeForce 6150]"
+0x10de  0x0241  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|GeForce Go 6150 LE"
+0x10de  0x0242  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|C51G [GeForce 6100]"
+0x10de  0x0243  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x0244  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|GeForce Go 6150"
+0x10de  0x0245  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x0246  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x0247  "Card:NVIDIA GeForce 6 Series"  "nVidia Corp.|GeForce Go 6100"
+0x10de  0x0248  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x0249  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x024a  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x024b  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x024c  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x024d  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x024e  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+0x10de  0x024f  "unknown"       "nVidia Corp.|C51 PCI Express Bridge"
+
 0x10de	0x0250	"Card:NVIDIA GeForce 4 (generic)"	"nVidia Corporation|NV25 [GeForce4 Ti 4600]"
 0x10de	0x0251	"Card:NVIDIA GeForce 4 (generic)"	"nVidia Corporation|NV25 [GeForce4 Ti 4400]"
 0x10de	0x0252	"Card:NVIDIA GeForce 4 (generic)"	"nVidia Corporation|NV25 [GeForce4 Ti]"