Fixed serial console

This commit is contained in:
Jaroslav Škarvada 2019-04-05 22:14:23 +02:00
parent ce9dd1e78c
commit 3d454a0b2a
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/lib.c b/lib.c
index a2b829d..6a7e210 100644
--- a/lib.c
+++ b/lib.c
@@ -1141,7 +1141,7 @@ void serial_console_setup(char *param)
end++;
- if (*end != '\0' || *end != ' ')
+ if (*end != '\0' && *end != ' ')
return; /* garbage at the end */
serial_bits = bits;

View File

@ -9,7 +9,7 @@
Name: memtest86+
Version: 5.01
Release: 24%{?dist}
Release: 25%{?dist}
License: GPLv2
Summary: Stand-alone memory tester for x86 and x86-64 computers
Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
@ -29,6 +29,7 @@ Patch2: memtest86+-5.01-compile-fix.patch
Patch3: memtest86+-5.01-crash-fix.patch
Patch4: memtest86+-5.01-fgnu89-inline.patch
Patch5: memtest86+-5.01-gcc34-fix.patch
Patch6: memtest86+-5.01-serial-console-fix.patch
URL: http://www.memtest.org
# require glibc-devel.i386 via this file:
BuildRequires: %{_includedir}/gnu/stubs-32.h
@ -60,6 +61,7 @@ cp -p %{SOURCE5} README.%{readme_suffix}
%patch3 -p1 -b .crash-fix
#%patch4 -p1 -b .fgnu89-inline
%patch5 -p1 -b .gcc34-fix
%patch6 -p1 -b .serial-console-fix
#sed -i -e's,0x10000,0x100000,' memtest.lds
%ifarch x86_64
@ -113,6 +115,9 @@ install -Dpm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/memtest86+.conf
%{_mandir}/man8/*.8.gz
%changelog
* Fri Apr 5 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 5.01-25
- Fixed serial console
* Tue Feb 5 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 5.01-24
- Temporally switched to compat-gcc-34
Resolves: rhbz#1598922