rpms/plymouth/F-12 fix-emergency-shell.patch, 1.1, 1.2 plymouth.spec, 1.157, 1.158

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7669

Modified Files:
	fix-emergency-shell.patch plymouth.spec 
Log Message:
- Fix more emergency shell horkage (for users without modesetting)
  (bug 528683)


fix-emergency-shell.patch:
 b/src/libplybootsplash/ply-keyboard.c |    4 +++-
 b/src/libplybootsplash/ply-renderer.c |   13 ++++++++++---
 b/src/libplybootsplash/ply-terminal.c |    4 ++--
 b/src/main.c                          |    3 ++-
 src/main.c                            |    7 +++----
 5 files changed, 20 insertions(+), 11 deletions(-)

Index: fix-emergency-shell.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/fix-emergency-shell.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-emergency-shell.patch	8 Oct 2009 21:50:00 -0000	1.1
+++ fix-emergency-shell.patch	13 Oct 2009 15:44:10 -0000	1.2
@@ -144,3 +144,29 @@ index f7f3c90..0966418 100644
 -- 
 1.6.5.rc2
 
+From 30fa8e2d48ab6ea8909a997aa983c475753059b2 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 8 Oct 2009 15:42:27 -0400
+Subject: [PATCH] [keyboard] make stop_watching_for_terminal_input idempotent
+
+---
+ src/libplybootsplash/ply-keyboard.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/libplybootsplash/ply-keyboard.c b/src/libplybootsplash/ply-keyboard.c
+index 375ddd5..ab72823 100644
+--- a/src/libplybootsplash/ply-keyboard.c
++++ b/src/libplybootsplash/ply-keyboard.c
+@@ -357,6 +357,9 @@ ply_keyboard_watch_for_terminal_input (ply_keyboard_t *keyboard)
+ static void
+ ply_keyboard_stop_watching_for_terminal_input (ply_keyboard_t *keyboard)
+ {
++  if (keyboard->provider.if_terminal->input_watch == NULL)
++    return;
++
+   ply_event_loop_stop_watching_fd (keyboard->loop,
+                                    keyboard->provider.if_terminal->input_watch);
+   keyboard->provider.if_terminal->input_watch = NULL;
+-- 
+1.6.5.rc2
+


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- plymouth.spec	9 Oct 2009 21:41:46 -0000	1.157
+++ plymouth.spec	13 Oct 2009 15:44:10 -0000	1.158
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.9%{?dist}
+Release: 0.2009.29.09.10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -470,6 +470,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Oct 13 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.10
+- Fix more emergency shell horkage (for users without modesetting)
+  (bug 528683)
+
 * Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.9
 - Fix frame-buffer fallback plugin
   (broken by details fix in 0.8.0-0.2009.29.09.7)