rpms/plymouth/devel serial-again.patch, NONE, 1.1 plymouth.spec, 1.48, 1.49

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11123

Modified Files:
	plymouth.spec 
Added Files:
	serial-again.patch 
Log Message:
- More serial console fixes (bug 460565 again)


serial-again.patch:

--- NEW FILE serial-again.patch ---
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;
+        }
     }
 }
 


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- plymouth.spec	5 Sep 2008 19:39:41 -0000	1.48
+++ plymouth.spec	8 Sep 2008 13:45:02 -0000	1.49
@@ -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 @@
 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 @@
 %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 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Mon Sep  8 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.09.05.4
+- More serial console fixes (bug 460565 again)
+
 * Fri Sep  5 2008 Bill Nottingham <notting at redhat.com> 0.6.0-0.2008.09.05.3
 - make the text plugin use the system release info rather than a hardcoded 'Fedora 10'