From 9ee95ca1e66cedaaa01ee5f1a9d965de8956ad21 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 10 Aug 2010 19:11:11 +0200
Subject: Components to load needed modules for bootsplash early in InitRamFS.

---
 initramfs/stage3-stuff/bin/hwautocfg                        | 8 ++++++++
 os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index a9a711e3..f645c534 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -28,6 +28,14 @@ done
 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
+if [ -e /etc/init-hooks/00-started/xserver.sh -o \
+     -e /etc/init-hooks/05-started/bootsplash.sh ]; then 
+  ( gfxcardmod=$(hwinfo --gfxcard|grep " Driver: "|sed "s/.*Driver//;s/\"//g")
+    modprobe ${MODPRV} ${gfxcardmod} ) &
+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
 hwinfo --netcard --usb-ctrl >/etc/hwinfo.netcard-usbctrl
diff --git a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
index 3e50b77f..0b08ec13 100644
--- a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
+++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
@@ -43,7 +43,9 @@ case ${slxconf_distro_ver} in
   "10.04"|"11.3")
      ;;
   *)
-     ( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) &
+     # hwinfo --gfxcard moved to general hardware detection as needed for two
+     # different plugins (bootsplash, xserver)
+     #( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) &
      ( hwinfo --monitor >/etc/hwinfo.display; grep "Generic Monitor" \
        /etc/hwinfo.display >/dev/null 2>&1 && rm /etc/hwinfo.display ) &
      ;;
-- 
cgit v1.2.3-55-g7522