From 5354228bb335d5b4277d6010769cbd9cc5d3a725 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Thu, 4 Oct 2007 17:13:25 +0000
Subject: splashy works now with ubuntu.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1367 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/init | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'initramfs/initrd-stuff/init')

diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index dc5e533d..709bd7bf 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -112,7 +112,9 @@ echo "noldap" > /tmp/ldap-done
 file="yes"
 
 # splashy stuff seems to depend on /proc/fb with VESA!?
-if cat /proc/fb |grep VESA > /dev/null 2>&1 ; then 
+# only activate with kernel option quiet
+if grep -qi '\(vesa|vga\)' /proc/fb > /dev/null 2>&1 \
+  && grep -qi " quiet " /proc/cmdline > /dev/null 2>&1; then
   export nosplash=0
 else
   export nosplash=1
@@ -272,9 +274,6 @@ $0\n# deprecated: please use rootfs=nfs://...\nnfsroot=\"${nfsroot}\"\n" \
       vci=${opts#vci=};;
     xenbr)
       xenbr=1;;
-    # splashy stuff
-    nosplash)
-      nosplash=1;;
   esac
 done
 
@@ -317,7 +316,7 @@ fi
 # set debug level and logfile
 if [ $DEBUGLEVEL -eq 20 ] ; then
   echo "** Setting debuglevel to ${DEBUGLEVEL} at $(sysup)"
-else
+elif [ $DEBUGLEVEL -ne 0 ] ; then
   echo "Setting debuglevel to ${DEBUGLEVEL}"
 fi
 export MODPRV=" "
-- 
cgit v1.2.3-55-g7522