Incomplete pcitable again (added some specific devices), fix for Xorg

call ...


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

4 files changed, 9 insertions, 3 deletions

diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 71792e04..7b425d5a 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -225,7 +225,7 @@ $vmsessions
 BaseXsession=/etc/opt/gnome/gdm/Xsession
 UserAuthFBDir=/tmp
 UserAuthFile=.Xauthority
-StandardXServer=/usr/X11R6/bin/X +kb -I
+StandardXServer=${D_XORGBIN} +kb -I
 Xnest=/usr/X11R6/bin/Xnest -audit 0 -name Xnest
 
 [security]
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 5c0de1b5..b07b9634 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -256,7 +256,7 @@ DefaultSession=default.desktop
 UserAuthDir=
 UserAuthFBDir=/tmp
 UserAuthFile=.Xauthority
-StandardXServer=/usr/X11R6/bin/X
+StandardXServer=${D_XORGBIN}
 Xnest=/usr/X11R6/bin/Xnest -br -audit 0 -name Xnest
 FirstVT=7
 VTAllocation=true
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 9179973c..271f050b 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -1009,7 +1009,7 @@ Willing=/${xdmdir}/Xwilling
 HaltCmd=/sbin/halt
 RebootCmd=/sbin/reboot
 [X-*-Core]
-ServerCmd=/usr/X11R6/bin/X -br
+ServerCmd=${D_XORGBIN} -br
 ServerArgsLocal=-nolisten tcp
 TerminateServer=true
 Resources=/${xdmdir}/Xresources
diff --git a/initramfs/initrd-stuff/usr/share/hwdata/pcitable b/initramfs/initrd-stuff/usr/share/hwdata/pcitable
index bf2ced32..2ecaeec6 100644
--- a/initramfs/initrd-stuff/usr/share/hwdata/pcitable
+++ b/initramfs/initrd-stuff/usr/share/hwdata/pcitable
@@ -277,6 +277,7 @@
 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  0x5974  "Card:ATI Radeon RS482"
 0x1002	0x700f	"unknown"	"ATI|PCI Bridge [IGP 320M]"
 0x1002	0x7010	"unknown"	"ATI|PCI Bridge [IGP 340M]"
 0x1002	0xcab0	"unknown"	"ATI|AGP Bridge [IGP 320M]"
@@ -1574,6 +1575,7 @@
 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	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]"
@@ -3273,6 +3275,10 @@
 0x8086	0x2579	"unknown"	"Intel Corp.|82875P Processor to AGP Controller"
 0x8086	0x257b	"unknown"	"Intel Corp.|82875P Processor to PCI to CSA Bridge"
 0x8086	0x257e	"unknown"	"Intel Corp.|82875P Processor to I/O Memory Interface"
+0x8086	0x2582	"Card:Intel 915"
+0x8086	0x2592	"Card:Intel 915"
+0x8086  0x2772  "Card:Intel 945"
+0x8086  0x2792  "Card:Intel 915GM"
 0x8086	0x3092	"i2o_block"	"Intel Corp.|Integrated RAID"
 0x8086	0x3340	"unknown"	"Intel Corp.|82855PM Processor to I/O Controller"
 0x8086	0x3341	"unknown"	"Intel Corp.|82855PM Processor to AGP Controller"