From 90f29b2cb29a613f6419f27bbb893aead960f2c0 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Fri, 13 Aug 2010 19:04:10 +0200
Subject: reenable splashy and vesafb until plymouth works

---
 os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm')

diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
index a4c13483..ec58d132 100644
--- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
+++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
@@ -86,10 +86,10 @@ sub suggestAdditionalKernelParams
 
     my @suggestedParams;
     
-#    # add vga=0x317 unless explicit vga-mode is already set
-#    if (!$makeInitRamFSEngine->haveKernelParam(qr{\bvga=})) {
-#        push @suggestedParams, 'vga=0x317';
-#    }
+    # add vga=0x317 unless explicit vga-mode is already set
+    if (!$makeInitRamFSEngine->haveKernelParam(qr{\bvga=})) {
+        push @suggestedParams, 'vga=0x317';
+    }
 
     # add quiet, if not already set
     if (!$makeInitRamFSEngine->haveKernelParam('quiet')) {
@@ -108,7 +108,7 @@ sub suggestAdditionalKernelModules
     
     # Ubuntu needs vesafb and fbcon (which drags along some others)
     #if ($makeInitRamFSEngine->{'distro-name'} =~ m{^ubuntu}i) {
-    push @suggestedModules, qw( i810 i830 i915 mga nouveau r128 radeon savage sis tdfx ttm via drm fbcon );
+    push @suggestedModules, qw( i810 i830 i915 mga nouveau r128 radeon savage sis tdfx ttm via drm fbcon vesafb );
     #}
     
     return @suggestedModules;
-- 
cgit v1.2.3-55-g7522