diff --git a/fix-emergency-shell.patch b/fix-emergency-shell.patch index b9393bd..e2545b1 100644 --- a/fix-emergency-shell.patch +++ b/fix-emergency-shell.patch @@ -170,3 +170,61 @@ index 375ddd5..ab72823 100644 -- 1.6.5.rc2 +From adf98f119b5f06c238b86860f690fe2af608d57f Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Tue, 6 Oct 2009 16:47:41 -0400 +Subject: [PATCH] [main] clean up terminal when done with it + +Before we were relying on the renderer to clean +up the terminal, which was wrong. +--- + src/main.c | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) + +diff --git a/src/main.c b/src/main.c +index e827da4..31f2b1e 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -94,6 +94,7 @@ typedef struct + ply_command_parser_t *command_parser; + ply_mode_t mode; + ply_renderer_t *renderer; ++ ply_terminal_t *terminal; + + ply_trigger_t *quit_trigger; + +@@ -608,6 +609,13 @@ quit_splash (state_t *state) + state->renderer = NULL; + } + ++ if (state->terminal != NULL) ++ { ++ ply_terminal_close (state->terminal); ++ ply_terminal_free (state->terminal); ++ state->terminal = NULL; ++ } ++ + ply_trace ("removing displays and keyboard"); + remove_displays_and_keyboard (state); + +@@ -935,6 +943,8 @@ add_display_and_keyboard_for_terminal (state_t *state, + return; + } + ++ state->terminal = terminal; ++ + ply_console_set_active_vt (state->console, + ply_terminal_get_vt_number (terminal)); + +@@ -1005,6 +1015,8 @@ add_default_displays_and_keyboard (state_t *state) + return; + } + ++ state->terminal = terminal; ++ + keyboard = ply_keyboard_new_for_renderer (renderer); + set_keyboard (state, keyboard); + +-- +1.6.5.rc2 + diff --git a/plymouth.spec b/plymouth.spec index 28a4ed2..4f26508 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -6,7 +6,7 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.8.0 -Release: 0.2009.29.09.10%{?dist} +Release: 0.2009.29.09.11%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -470,6 +470,9 @@ fi %defattr(-, root, root) %changelog +* Tue Oct 13 2009 Ray Strode 0.8.0-0.2009.29.09.11 +- Clean up terminal on exit (bug 528683 again) + * Tue Oct 13 2009 Ray Strode 0.8.0-0.2009.29.09.10 - Fix more emergency shell horkage (for users without modesetting) (bug 528683)