1 files changed, 19 insertions, 100 deletions
diff --git a/0015-bootsplash.patch b/0015-bootsplash.patch
index 0924d29e7d48..add68e7b275c 100644..100755
--- a/0015-bootsplash.patch
+++ b/0015-bootsplash.patch
@@ -1,102 +1,21 @@
-diff --git a/Documentation/bootsplash.rst b/Documentation/bootsplash.rst
-index b35aba5093e8..d4f132eca615 100644
---- a/Documentation/bootsplash.rst
-+++ b/Documentation/bootsplash.rst
-@@ -195,6 +195,16 @@ Hooks - how the bootsplash is integrated
+diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
+index 9a39a6fcfe98..8a9c67e1c5d8 100644
+--- a/drivers/video/fbdev/core/fbcon.c
++++ b/drivers/video/fbdev/core/fbcon.c
+@@ -1343,6 +1343,16 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
+ 	int y;
+  	int c = scr_readw((u16 *) vc->vc_pos);
  
++	/*
++	 * Disable the splash here so we don't have to hook into
++	 * vt_console_print() in drivers/tty/vt/vt.c
++	 *
++	 * We'd disable the splash just before the call to
++	 * hide_cursor() anyway, so this spot is just fine.
++	 */
++	if (oops_in_progress)
++		bootsplash_disable();
++
+ 	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
  
- 
-+Crating a bootsplash theme file
-+===============================
-+
-+A simple tool for theme file creation is included in ``tools/bootsplash``.
-+
-+There is also an example shell script, as an example on how to use the tool
-+and in order to generate a reference bootsplash file.
-+
-+
-+
- FAQ: Frequently Asked Questions
- ===============================
- 
-diff --git a/tools/bootsplash/.gitignore b/tools/bootsplash/.gitignore
-index 091b99a17567..5dfced41ba82 100644
---- a/tools/bootsplash/.gitignore
-+++ b/tools/bootsplash/.gitignore
-@@ -1 +1,4 @@
- bootsplash-packer
-+bootsplash
-+logo.rgb
-+throbber*.rgb
-diff --git a/tools/bootsplash/bootsplash-tux.sh b/tools/bootsplash/bootsplash-tux.sh
-new file mode 100755
-index 000000000000..1078f87644b9
---- /dev/null
-+++ b/tools/bootsplash/bootsplash-tux.sh
-@@ -0,0 +1,66 @@
-+#!/bin/bash
-+#
-+# A simple script to show how to create a bootsplash.
-+# Do with it whatever you wish.
-+#
-+# This needs ImageMagick for the 'convert' and 'identify' tools.
-+#
-+
-+LOGO=../../Documentation/logo.gif
-+LOGO_WIDTH=$(identify $LOGO | cut -d " " -f 3 | cut -d x -f 1)
-+LOGO_HEIGHT=$(identify $LOGO | cut -d " " -f 3 | cut -d x -f 2)
-+
-+THROBBER=ajax-loader.gif
-+THROBBER_WIDTH=$(identify $THROBBER | head -1 | cut -d " " -f 3 | \
-+						cut -d x -f 1)
-+THROBBER_HEIGHT=$(identify $THROBBER | head -1 | cut -d " " -f 3 | \
-+						 cut -d x -f 2)
-+
-+convert -alpha remove \
-+	-background "#ff3a40" \
-+	$LOGO \
-+	logo.rgb
-+
-+convert -alpha remove \
-+	-background "#ff3a40" \
-+	$THROBBER \
-+	throbber%02d.rgb
-+
-+
-+make clean
-+make bootsplash-packer
-+
-+
-+# Let's put Tux in the center of an orange background.
-+./bootsplash-packer \
-+	--bg_red 0xff \
-+	--bg_green 0x3a \
-+	--bg_blue 0x40 \
-+	--frame_ms 48 \
-+	--picture \
-+	--pic_width $LOGO_WIDTH \
-+	--pic_height $LOGO_HEIGHT \
-+	--pic_position 0 \
-+	--blob logo.rgb \
-+	--picture \
-+	--pic_width $THROBBER_WIDTH \
-+	--pic_height $THROBBER_HEIGHT \
-+	--pic_position 0x14 \
-+	--pic_position_offset 20 \
-+	--pic_anim_type 1 \
-+	--pic_anim_loop 0 \
-+	--blob throbber00.rgb \
-+	--blob throbber01.rgb \
-+	--blob throbber02.rgb \
-+	--blob throbber03.rgb \
-+	--blob throbber04.rgb \
-+	--blob throbber05.rgb \
-+	--blob throbber06.rgb \
-+	--blob throbber07.rgb \
-+	--blob throbber08.rgb \
-+	--blob throbber09.rgb \
-+	--blob throbber10.rgb \
-+	--blob throbber11.rgb \
-+	bootsplash
-+
-+rm *.rgb
+ 	if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)