Used ELF format with grub2

This commit is contained in:
Jaroslav Škarvada 2011-12-07 23:44:46 +01:00
parent fd66414e2d
commit 4e39524515
2 changed files with 8 additions and 4 deletions

View File

@ -81,19 +81,20 @@ memtest_entry ()
fi fi
message="$(gettext_printf "Loading %s %s ..." ${os} ${version})" message="$(gettext_printf "Loading %s %s ..." ${os} ${version})"
cat << EOF cat << EOF
insmod bsd
echo '$message' echo '$message'
linux16 ${rel_dirname}/${basename} knetbsd ${rel_dirname}/${basename}
} }
EOF EOF
} }
case x`uname -m` in case x`uname -m` in
xi?86 | xx86_64) 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 if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done` ;; 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 if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done` ;; done` ;;
esac esac

View File

@ -7,7 +7,7 @@
Name: memtest86+ Name: memtest86+
Version: 4.20 Version: 4.20
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2 License: GPLv2
Summary: Stand-alone memory tester for x86 and x86-64 computers Summary: Stand-alone memory tester for x86 and x86-64 computers
Group: System Environment/Base Group: System Environment/Base
@ -98,6 +98,9 @@ rm -rf %{buildroot}
%{_sbindir}/memtest-setup %{_sbindir}/memtest-setup
%changelog %changelog
* Wed Dec 7 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 4.20-4
- Used ELF format with grub2
* Wed Dec 7 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 4.20-3 * Wed Dec 7 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 4.20-3
- Renamed 20_memtest to 20_memtest86+ - Renamed 20_memtest to 20_memtest86+
- Fixed ghost handling, 20_memtest86+ is properly removed now - Fixed ghost handling, 20_memtest86+ is properly removed now