forked from rpms/plymouth
drop upstreamed patch
This commit is contained in:
parent
ed90194e84
commit
97dbed231a
@ -9,7 +9,6 @@ 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
|
||||
@ -107,7 +106,6 @@ 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 \
|
||||
|
@ -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;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user