rpms/kernel/devel linux-2.6-silence-fbcon-logo.patch, NONE, 1.1 kernel.spec, 1.684, 1.685

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12255

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-silence-fbcon-logo.patch 
Log Message:
Silence the penguin in fbcon with "quiet"


linux-2.6-silence-fbcon-logo.patch:

--- NEW FILE linux-2.6-silence-fbcon-logo.patch ---
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 97aff8d..5e230b6 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -674,13 +674,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
 		kfree(save);
 	}
 
-	if (logo_lines > vc->vc_bottom) {
-		logo_shown = FBCON_LOGO_CANSHOW;
-		printk(KERN_INFO
-		       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
-	} else if (logo_shown != FBCON_LOGO_DONTSHOW) {
-		logo_shown = FBCON_LOGO_DRAW;
-		vc->vc_top = logo_lines;
+	if (logo_shown != FBCON_LOGO_DONTSHOW) {
+		if (logo_lines > vc->vc_bottom) {
+			logo_shown = FBCON_LOGO_CANSHOW;
+			printk(KERN_INFO
+			       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
+		} else {
+			logo_shown = FBCON_LOGO_DRAW;
+			vc->vc_top = logo_lines;
+		}
 	}
 }
 #endif /* MODULE */
@@ -3604,6 +3606,13 @@ static int __init fb_console_init(void)
 	return 0;
 }
 
+static int __init quiet_logo(char *str)
+{
+	logo_shown = FBCON_LOGO_DONTSHOW;
+}
+
+early_param("quiet", quiet_logo);
+
 module_init(fb_console_init);
 
 #ifdef MODULE


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -r1.684 -r1.685
--- kernel.spec	11 Jun 2008 15:52:43 -0000	1.684
+++ kernel.spec	11 Jun 2008 20:16:39 -0000	1.685
@@ -602,7 +602,8 @@
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
-Patch620: linux-2.6-silence-x86-decompressor.patch
+Patch520: linux-2.6-silence-x86-decompressor.patch
+Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 Patch610: linux-2.6-defaults-fat-utf8.patch
@@ -1109,6 +1110,9 @@
 # Make the real mode boot decompressor understand and honor 'quiet'
 ApplyPatch linux-2.6-silence-x86-decompressor.patch
 
+# Make fbcon not show the penguins with 'quiet'
+ApplyPatch linux-2.6-silence-fbcon-logo.patch
+
 # Fix the SELinux mprotect checks on executable mappings
 ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
@@ -1776,6 +1780,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Jun 11 2008 Peter Jones <pjones at redhat.com>
+- Don't show the penguin in fbcon with "quiet"
+
 * Wed Jun 11 2008 Dave Jones <davej at redhat.com>
 - 2.6.26-rc5-git5