Renamed 20_memtest to 20_memtest86+

Fixed ghost handling, 20_memtest86+ is properly removed now
This commit is contained in:
Jaroslav Škarvada 2011-12-07 15:48:31 +01:00
parent e7f3321cff
commit fd66414e2d
3 changed files with 11 additions and 7 deletions

View File

@ -7,7 +7,7 @@ PNAME="memtest86+"
ENAME="elf-memtest86+"
# grub2 template
G2TEMPL="20_memtest"
G2TEMPL="20_memtest86+"
if [ -d /sys/firmware/efi ]; then
echo "memtest86+ does not support EFI platforms."

View File

@ -7,14 +7,14 @@
Name: memtest86+
Version: 4.20
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Summary: Stand-alone memory tester for x86 and x86-64 computers
Group: System Environment/Base
Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
Source1: memtest-setup
Source2: new-memtest-pkg
Source3: 20_memtest
Source3: 20_memtest86+
URL: http://www.memtest.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# require glibc-devel.i386 via this file:
@ -66,8 +66,8 @@ install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg
install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup
sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
mkdir -p %{buildroot}%{_sysconfdir}/boot.d
touch %{buildroot}%{_sysconfdir}/boot.d/20_memtest
mkdir -p %{buildroot}%{_sysconfdir}/grub.d
touch %{buildroot}%{_sysconfdir}/grub.d/20_memtest86+
install -Dd %{buildroot}%{_datadir}/%{name}
install -m644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}
@ -93,11 +93,15 @@ rm -rf %{buildroot}
/boot/elf-%{name}-%{version}
/sbin/new-memtest-pkg
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/20_memtest
%ghost %attr(0755,-,-) %{_sysconfdir}/boot.d/20_memtest
%{_datadir}/%{name}/20_memtest86+
%ghost %attr(0755,-,-) %{_sysconfdir}/grub.d/20_memtest86+
%{_sbindir}/memtest-setup
%changelog
* Wed Dec 7 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 4.20-3
- Renamed 20_memtest to 20_memtest86+
- Fixed ghost handling, 20_memtest86+ is properly removed now
* Mon Dec 5 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 4.20-2
- Added support for grub2, thanks to Michal Ambroz <rebus@seznam.cz>