[plymouth/f14/master] Try to address a serial console crash

[Ray Strode]

commit f036801c0e07a517aa100cb47d9cb6492243e4b4
Author: Ray Strode <rstrode at redhat.com>
Date:   Wed Oct 13 11:30:36 2010 -0400

    Try to address a serial console crash

 fix-serial-console-crash.patch |   29 +++++++++++++++++++++++++++++
 plymouth.spec                  |    7 +++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/fix-serial-console-crash.patch b/fix-serial-console-crash.patch
new file mode 100644
index 0000000..58c3fa3
--- /dev/null
+++ b/fix-serial-console-crash.patch
@@ -0,0 +1,29 @@
+From 18541c1d58612f1535972c54940bbb460c5cab06 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 7 Oct 2010 12:47:47 -0400
+Subject: [PATCH] main: NULL initialize "console" variable
+
+check_for_consoles is a really small function, that has historically
+been loaded with bugs.
+
+This commit fixes another bug in it, where the consoles variable is
+never initialized to NULL.
+---
+ src/main.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 2787aed..7358c24 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -1765,6 +1765,7 @@ check_for_consoles (state_t    *state,
+ 
+   remaining_command_line = state->kernel_command_line;
+ 
++  console = NULL;
+   consoles = ply_hashtable_new (ply_hashtable_string_hash,
+                                 ply_hashtable_string_compare);
+   while ((console_string = command_line_get_string_after_prefix (remaining_command_line,
+-- 
+1.7.3.1
+
diff --git a/plymouth.spec b/plymouth.spec
index 4452153..c58d6d2 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -32,6 +32,8 @@ Obsoletes: plymouth-text-and-details-only < %{version}-%{release}
 Obsoletes: plymouth-plugin-pulser < 0.7.0-0.2009.05.08.2
 Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
 
+Patch0: fix-serial-console-crash.patch
+
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -244,6 +246,7 @@ plugin.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-serial-crash
 
 # Change the default theme
 sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@@ -490,6 +493,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Oct 13 2010 Ray Strode <rstrode at redhat.com> 0.8.4-0.20100823.4
+- Fix serial console crash.
+  Related: #642699
+
 * Wed Sep 01 2010 Ray Strode <rstrode at redhat.com> 0.8.4-0.20100823.4
 - Add more Requirse