From 750b6b0b8ad4ea759ccebf41cef4a9798e8eed6c Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 27 May 2011 14:53:13 +0200
Subject: No vga= sensible any more ...

---
 src/initramfs/distro-specs/suse/functions-default                | 3 ---
 src/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/initramfs/distro-specs/suse/functions-default b/src/initramfs/distro-specs/suse/functions-default
index c5b29fcb..e20a6362 100644
--- a/src/initramfs/distro-specs/suse/functions-default
+++ b/src/initramfs/distro-specs/suse/functions-default
@@ -91,9 +91,6 @@ echo '
 #
 ###########################################################################
 
-# Before we do anything else, try at first to activate SELinux support
-test -d /selinux && mount -n -t selinuxfs none /selinux &>/dev/null
-
 # Configuration and coloring of the boot messages
 . /etc/rc.status
 . /etc/sysconfig/boot
diff --git a/src/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/src/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
index ef1db778..4212cff3 100644
--- a/src/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
+++ b/src/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2007..2010 - OpenSLX GmbH
+# Copyright (c) 2007..2011 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -87,9 +87,9 @@ sub suggestAdditionalKernelParams
     my @suggestedParams;
     
     # add vga=0x317 unless explicit vga-mode is already set
-    if (!$makeInitRamFSEngine->haveKernelParam(qr{\bvga=})) {
-        push @suggestedParams, 'vga=0x317';
-    }
+    #if (!$makeInitRamFSEngine->haveKernelParam(qr{\bvga=})) {
+    #    push @suggestedParams, 'vga=0x317';
+    #}
 
     # add quiet, if not already set
     if (!$makeInitRamFSEngine->haveKernelParam('quiet')) {
-- 
cgit v1.2.3-55-g7522