rpms/plymouth/F-12 fix-2nd-show-splash.patch, NONE, 1.1 plymouth.spec, 1.148, 1.149

[Ray Strode]

Author: rstrode

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

Modified Files:
	plymouth.spec 
Added Files:
	fix-2nd-show-splash.patch 
Log Message:
- Fix --show-splash after --hide-splash (bug 527299)


fix-2nd-show-splash.patch:
 main.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE fix-2nd-show-splash.patch ---
>From 2af482af166dbb18816b6f9fbee2b8ea6dc1a355 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 5 Oct 2009 16:51:40 -0400
Subject: [PATCH] [main] Properly reinitialize environment on show splash

Before we were tearing down the displays and keyboard on hide
splash but not bringing them back on subsequent show splashes.

This fixes that.  We can probably throw less stuff away on
hide splash, but this is a more conservative fix for now.
---
 src/main.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main.c b/src/main.c
index 08ec1ae..e827da4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -131,6 +131,8 @@ static void on_error_message (ply_buffer_t *debug_buffer,
                               size_t        number_of_bytes);
 static ply_buffer_t *debug_buffer;
 static char *debug_buffer_path = NULL;
+static void check_for_consoles (state_t    *state,
+                                const char *default_tty);
 
 static void
 on_session_output (state_t    *state,
@@ -560,6 +562,8 @@ on_show_splash (state_t *state)
       return;
     }
 
+  check_for_consoles (state, state->default_tty);
+
   has_display = ply_list_get_length (state->pixel_displays) > 0 ||
                 ply_list_get_length (state->text_displays) > 0;
 
@@ -597,9 +601,6 @@ quit_splash (state_t *state)
       state->boot_splash = NULL;
     }
 
-  ply_trace ("removing displays and keyboard");
-  remove_displays_and_keyboard (state);
-
   if (state->renderer != NULL)
     {
       ply_renderer_close (state->renderer);
@@ -607,6 +608,9 @@ quit_splash (state_t *state)
       state->renderer = NULL;
     }
 
+  ply_trace ("removing displays and keyboard");
+  remove_displays_and_keyboard (state);
+
   if (state->session != NULL)
     {
       ply_trace ("detaching session");
@@ -1265,9 +1269,11 @@ check_for_consoles (state_t    *state,
 
   ply_trace ("checking if splash screen should be disabled");
 
-  state->console = ply_console_new ();
+  if (state->console == NULL)
+    state->console = ply_console_new ();
 
-  if (!ply_console_open (state->console))
+  if (!ply_console_is_open (state->console) &&
+      !ply_console_open (state->console))
     {
       ply_trace ("could not open /dev/tty0");
       ply_console_free (state->console);
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- plymouth.spec	29 Sep 2009 17:40:25 -0000	1.148
+++ plymouth.spec	5 Oct 2009 20:57:55 -0000	1.149
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.1%{?dist}
+Release: 0.2009.29.09.2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -451,6 +451,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Oct  5 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.2
+- Fix --show-splash after --hide-splash (bug 527299)
+
 * Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.1
 - Fix escape and ask-for-password