alaurie/plymouth
1
0
Fork 0
forked from rpms/plymouth
Code Pull Requests Activity

drop upstreamed patch

Browse Source
This commit is contained in:
Ray Strode 2008-09-10 19:05:14 +00:00
parent ed90194e84
commit 97dbed231a
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plymouth.spec
View File

@ -9,7 +9,6 @@ URL: http://freedesktop.org/software/plymouth/releases
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: plymouth-0.5.0-textbar-hotness.patch Patch0: plymouth-0.5.0-textbar-hotness.patch
Patch1: serial-again.patch
Obsoletes: rhgb < 1:10.0.0 Obsoletes: rhgb < 1:10.0.0
Provides: rhgb = 1:10.0.0 Provides: rhgb = 1:10.0.0
@ -107,7 +106,6 @@ spins in the shape of an infinity sign.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .textbar %patch0 -p1 -b .textbar
%patch1 -p1 -b .serial-again
%build %build
%configure --enable-tracing --disable-tests --without-boot-entry \ %configure --enable-tracing --disable-tests --without-boot-entry \

22
serial-again.patch
View File

@ -1,22 +0,0 @@
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 - state->console;
+ }
}
}