diff options
| author | Dirk von Suchodoletz | 2010-08-11 03:14:54 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-08-11 03:14:54 +0200 |
| commit | 98c82e0cefa2dc14f2de5262a63701ca2ab05316 (patch) | |
| tree | 8d7113aeb250ac72d077484b79cd941cea3814b0 /initramfs/stage3-stuff/bin/hwautocfg | |
| parent | Test ... (diff) | |
| download | core-98c82e0cefa2dc14f2de5262a63701ca2ab05316.tar.gz core-98c82e0cefa2dc14f2de5262a63701ca2ab05316.tar.xz core-98c82e0cefa2dc14f2de5262a63701ca2ab05316.zip | |
Next step for early framebuffer, bootsplash ...
Diffstat (limited to 'initramfs/stage3-stuff/bin/hwautocfg')
| -rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index fc1fbc8f..ca777eeb 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -29,13 +29,17 @@ echo "0 0 0 0" >/proc/sys/kernel/printk echo "/sbin/mdev" >/proc/sys/kernel/hotplug modprobe -a ${MODPRV} usbhid hid-bright 2>/dev/null & # get information on the graphics adaptor if bootsplash or xserver plugins are -# present +# present and the new drm/kms infrastructure is present if [ -e /etc/init-hooks/00-started/xserver.sh -o \ -e /etc/init-hooks/05-started/bootsplash.sh ] && \ - [ -e /lib/modules/${KERNEL}/kernel/drivers/gpu ]; then - ( gfxcardmod=$(hwinfo --gfxcard|grep " Driver: "|sed "s/.*Driver//;s/\"//g") - echo ${gfxcardmod} drm fbcon >/tmp/bootsplash ) & + [ -e /lib/modules/${KERNEL}/kernel/drivers/gpu ]; then + fbmodlist="i810 i830 i915 mga nouveau r128 radeon savage sis tdfx ttm via" + modprobe -a ${MODPRV} ${fbmodlist} drm fbcon 2>/dev/null + ( hwinfo --gfxcard >/etc/hwinfo.gfxcard + gfxcard=$(grep " Driver: " /etc/hwinfo.gfxcard|sed "s/.*Driver: //;s/\"//g") + ) & fi + # check and then load appropriate network card modules nwcardlist=$(echo ${slxconf_listnwmod}|sed "s/\ /|/g") # save results for later info and for Xen plugin when starting Xen VM @@ -47,6 +51,7 @@ if [ $(grep -ic "virtio_pci" /etc/modprobe.base) -ge 1 ]; then echo "modprobe virtio_net" >>/etc/modprobe.base fi ash /etc/modprobe.base; mdev -s + # optimization possible: exclude network and usb base drivers from the # following list (bios detection for non-hwautocfg component) ( hwinfo --pci >/etc/hwinfo.data; echo "read pci device list at $(sysup)" \ |