rpms/memtest86plus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Not updating grub.conf by default.

Browse Source
This commit is contained in:
Paulo Roma Cavalcanti 2009-04-02 13:34:30 +00:00
parent fc4e404fd0
commit 73531ea523
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
import.log
View File

@ -1,2 +1,3 @@
memtest86+-2_11-4_fc10:HEAD:memtest86+-2.11-4.fc10.src.rpm:1236973348 memtest86+-2_11-4_fc10:HEAD:memtest86+-2.11-4.fc10.src.rpm:1236973348
memtest86+-2_11-5_fc10:HEAD:memtest86+-2.11-5.fc10.src.rpm:1238510694 memtest86+-2_11-5_fc10:HEAD:memtest86+-2.11-5.fc10.src.rpm:1238510694
memtest86+-2_11-6_fc10:HEAD:memtest86+-2.11-6.fc10.src.rpm:1238679177

30
memtest86+.spec
View File

@ -7,7 +7,7 @@
Summary: Stand-alone memory tester for x86 and x86-64 computers Summary: Stand-alone memory tester for x86 and x86-64 computers
Name: memtest86+ Name: memtest86+
Version: 2.11 Version: 2.11
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2 License: GPLv2
ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64
Group: System Environment/Base Group: System Environment/Base
@ -19,9 +19,11 @@ Source2: memtest-setup
BuildRequires: %{_includedir}/gnu/stubs-32.h BuildRequires: %{_includedir}/gnu/stubs-32.h
BuildRequires: compat-gcc-34 BuildRequires: compat-gcc-34
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: /sbin/grubby Requires: /sbin/grubby sed
%if %{with update_grub}
Requires(preun): coreutils Requires(preun): coreutils
Requires(post): coreutils Requires(post): coreutils
%endif
%description %description
Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 Memtest86+ is a thorough stand-alone memory test for x86 and x86-64
@ -33,7 +35,9 @@ This version avoids the following errors when booting from grub:
"Error 7: Loading below 1MB is not supported" "Error 7: Loading below 1MB is not supported"
"Error 13: Invalid or unsupported executable format" "Error 13: Invalid or unsupported executable format"
"Error 28: Selected item cannot fit into memory" "Error 28: Selected item cannot fit into memory"
Optionally, run 'memtest-setup' to add to your GRUB or lilo boot menu.
Please, run '/usr/sbin/memtest-setup' as root to add
the memtest86+ entry to your GRUB or lilo boot menu.
%prep %prep
%setup -q %setup -q
@ -57,24 +61,13 @@ install -m755 %{SOURCE1} %{buildroot}/sbin/new-memtest-pkg
install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
%post
%if %{with update_grub} %if %{with update_grub}
/usr/sbin/memtest-setup %post -p /usr/sbin/memtest-setup
%else
cat << EOF
************************************************
* REMINDER: Please update your /etc/grub.conf *
* file and add the memtest86+ boot entry, *
* by running /usr/sbin/memtest-setup as root. *
************************************************
EOF
%endif
%preun %preun
sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
/sbin/new-memtest-pkg --remove %{version} /sbin/new-memtest-pkg --remove %{version}
%endif
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -87,6 +80,11 @@ rm -rf %{buildroot}
%{_sbindir}/memtest-setup %{_sbindir}/memtest-setup
%changelog %changelog
* Thu Apr 02 2009 Paulo Roma <roma@lcg.ufrj.br> - 2.11-6
- grub.conf will not be updated by default. The user
will have to add and/or remove memtest86+ entries.
- No messages printed.
* Mon Mar 31 2009 Paulo Roma <roma@lcg.ufrj.br> - 2.11-5 * Mon Mar 31 2009 Paulo Roma <roma@lcg.ufrj.br> - 2.11-5
- Changed postun for preun. - Changed postun for preun.
- Calling memtest-setup in case of updating grub.conf - Calling memtest-setup in case of updating grub.conf