From 8d50556230b8f973c48b058001425d9a5b23a03e Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 13 Aug 2010 19:10:24 +0200
Subject: Re-enabling traditional splashy via vesafb ... (for Ubuntu 10.04)

---
 initramfs/stage3-stuff/bin/hwautocfg | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'initramfs/stage3-stuff/bin/hwautocfg')

diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index 09eb62da..0165a455 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -30,12 +30,15 @@ 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 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
-   # check for the standard modules (single gpu, multiple connector only)
-   ( hwinfo --gfxcard >/etc/hwinfo.gfxcard
-     case $(cat /etc/hwinfo.gfxcard) in
+if strinstr "vga=" "${KCMDLINE}"; then
+  ( modprobe vesafb fbcon 2>/dev/null
+    hwinfo --gfxcard >/etc/hwinfo.gfxcard ) &
+elif [ -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
+ # check for the standard modules (single gpu, multiple connector only)
+  ( hwinfo --gfxcard >/etc/hwinfo.gfxcard
+    case $(cat /etc/hwinfo.gfxcard) in
        *i915*)
          modprobe -a ${MODPRV} i915 2>/dev/null
          ;;
@@ -54,8 +57,8 @@ if [ -e /etc/init-hooks/00-started/xserver.sh -o \
        *)
          modprobe -a ${MODPRV} r128 savage sis tdfx ttm via
          ;;
-     esac
-     modprobe -a drm fbcon; mdev -s ) & 
+    esac
+    modprobe -a drm fbcon; mdev -s ) & 
 fi
  
 # check and then load appropriate network card modules
-- 
cgit v1.2.3-55-g7522