[memtest86+] Used ELF format with grub2
Jaroslav Škarvada
jskarvad at fedoraproject.org
Wed Dec 7 22:45:09 UTC 2011
commit 4e39524515a64de38fe17a9a7ecc89e8b23949e7
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Wed Dec 7 23:44:46 2011 +0100
Used ELF format with grub2
20_memtest86+ | 7 ++++---
memtest86+.spec | 5 ++++-
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/20_memtest86+ b/20_memtest86+
index 9481ff1..04c3f02 100644
--- a/20_memtest86+
+++ b/20_memtest86+
@@ -81,19 +81,20 @@ memtest_entry ()
fi
message="$(gettext_printf "Loading %s %s ..." ${os} ${version})"
cat << EOF
+ insmod bsd
echo '$message'
- linux16 ${rel_dirname}/${basename}
+ knetbsd ${rel_dirname}/${basename}
}
EOF
}
case x`uname -m` in
xi?86 | xx86_64)
- list=`for i in /boot/memtest* ; do
+ list=`for i in /boot/elf-memtest* ; do
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done` ;;
*)
- list=`for i in /boot/memtest* ; do
+ list=`for i in /boot/elf-memtest* ; do
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done` ;;
esac
diff --git a/memtest86+.spec b/memtest86+.spec
index d289580..c94c239 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -7,7 +7,7 @@
Name: memtest86+
Version: 4.20
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Summary: Stand-alone memory tester for x86 and x86-64 computers
Group: System Environment/Base
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
%{_sbindir}/memtest-setup
%changelog
+* Wed Dec 7 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 4.20-4
+- Used ELF format with grub2
+
* Wed Dec 7 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 4.20-3
- Renamed 20_memtest to 20_memtest86+
- Fixed ghost handling, 20_memtest86+ is properly removed now
More information about the scm-commits
mailing list