diff --git a/plymouth.spec b/plymouth.spec index 438e413..9a8be14 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ Summary: Plymouth Graphical Boot Animation and Logger Name: plymouth Version: 0.6.0 -Release: 0.2008.09.05.3%{?dist} +Release: 0.2008.09.05.4%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -9,6 +9,7 @@ URL: http://freedesktop.org/software/plymouth/releases BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: plymouth-0.5.0-textbar-hotness.patch +Patch1: serial-again.patch Obsoletes: rhgb < 1:10.0.0 Provides: rhgb = 1:10.0.0 @@ -106,6 +107,7 @@ spins in the shape of an infinity sign. %prep %setup -q %patch0 -p1 -b .textbar +%patch1 -p1 -b .serial-again %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -226,6 +228,9 @@ fi %{_libdir}/plymouth/spinfinity.so %changelog +* Mon Sep 8 2008 Ray Strode 0.5.0-0.2008.09.05.4 +- More serial console fixes (bug 460565 again) + * Fri Sep 5 2008 Bill Nottingham 0.6.0-0.2008.09.05.3 - make the text plugin use the system release info rather than a hardcoded 'Fedora 10' diff --git a/serial-again.patch b/serial-again.patch new file mode 100644 index 0000000..d838fd6 --- /dev/null +++ b/serial-again.patch @@ -0,0 +1,22 @@ +diff --git a/src/main.c b/src/main.c +index 71508c4..ca5f21c 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -498,12 +498,15 @@ check_for_serial_console (state_t *state) + free (state->console); + state->console = strdup (console_key + strlen (" console=")); + +- remaining_command_line = console_key + strlen (state->console) + strlen (" console="); ++ remaining_command_line = console_key + strlen (" console="); + + end = strpbrk (state->console, " \n\t\v,"); + + if (end != NULL) +- *end = '\0'; ++ { ++ *end = '\0'; ++ remaining_command_line += end - console; ++ } + } + } +