diff --git a/.cvsignore b/.cvsignore index e69de29..1852547 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +memtest_source_v1.11.tar.gz diff --git a/memtest-setup b/memtest-setup new file mode 100755 index 0000000..0a44d30 --- /dev/null +++ b/memtest-setup @@ -0,0 +1,25 @@ +#!/bin/bash + +MTVERSION=`rpm -q --qf '%{version}' memtest86+` +MTPATH="/boot/memtest86+-$MTVERSION" + +/sbin/grubby --info=$MTPATH > /dev/null 2> /dev/null +if [ "$?" = 0 ]; then + echo "$MTPATH is already configured. Exiting..." + exit 0 +fi + +if [ ! -f $MTPATH ]; then + echo "ERROR: $MTPATH does not exist." + exit 255 +fi + +/sbin/new-memtest-pkg --install $MTVERSION --banner="Memtest86+" +RETVAL="$?" + +if [ "$RETVAL" != "0" ]; then + echo "ERROR: grubby failed to configure your bootloader for $MTPATH." + exit $RETVAL +fi + +echo "Setup complete." diff --git a/memtest86+.spec b/memtest86+.spec new file mode 100644 index 0000000..372882b --- /dev/null +++ b/memtest86+.spec @@ -0,0 +1,139 @@ +# Prevent stripping +%define __spec_install_post /usr/lib/rpm/brp-compress +# Turn off debuginfo package +%define debug_package %{nil} + +Summary: Stand-alone memory tester for x86 and x86-64 computers +Name: memtest86+ +Version: 1.11 +Release: 2 +License: GPL +ExclusiveArch: i386 +Group: System Environment/Base +Source0: http://memtest.org/download/memtest_source_v1.11.tar.gz +URL: http://www.memtest.org +Source1: new-memtest-pkg +Source2: memtest-setup +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Obsoletes: memtest86 + + +%description +Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 +architecture computers. BIOS based memory tests are only a quick +check and often miss many of the failures that are detected by +Memtest86+. + +Run 'memtest-setup' to add to your GRUB or lilo boot menu. + +%prep +%setup -q -n memtest86+_v1.11 + +%build +# Regular build flags not wanted for this binary +# Note: i486 minimum runtime arch +make + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/boot +mkdir -p $RPM_BUILD_ROOT/sbin +mkdir -p $RPM_BUILD_ROOT%{_sbindir} + +install -m644 memtest.bin $RPM_BUILD_ROOT/boot/memtest86+-1.11 +install -m755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/new-memtest-pkg +install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/memtest-setup + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc README +/boot/memtest86+-1.11 +/sbin/new-memtest-pkg +%{_sbindir}/memtest-setup + +%preun +/sbin/new-memtest-pkg --remove %{version} + +%changelog +* Sun Feb 29 2004 Warren Togami 1.11-2 +- switch to memtest86+ 1.11 +- add boot loader setup script + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Oct 21 2003 Mike A. Harris 3.0-3 +- Pedantic spec file cleanups - s/Copyright/License/ and use _libdir instead of + /usr/lib everywhere (even though it's currently x86 only) + +* Tue Oct 21 2003 Jeremy Katz 3.0-2 +- fix perms (#107610) +- doesn't really require dev86 to build + +* Thu Jul 21 2003 Michael Fulbright +- initial integration into distribution. Removed the scripts to install a + entry in the boot loader for memtest for the moment, and relocated to under + /usr/lib. + +* Thu Apr 17 2003 Joe Szep +- rebuilt for Doolittle final + +* Mon Feb 3 2003 Matthew Miller +- rebuild for doolittle +- patches to make build -- new gcc growing pains, I guess + +* Tue Jul 30 2002 Matthew Miller +- added grubby stuff + +* Tue Jul 30 2002 Dave Heistand +- updated source to v 3 + +* Thu Mar 7 2002 Dave Heistand +- updated source to 2.9, also changed setup -n +- to use %{version}. + +* Thu Nov 1 2001 Matthew Miller +- v 2.8a +- removed lilo-configuring scripts. need to figure out the best way to + work with grub and RH 7.2 / BU Linux 2.5 +- group -> System Environment/Base + +* Mon Aug 20 2001 Matthew Miller +- v 2.7 + +* Wed Feb 14 2001 Matthew Miller +- v 2.5 + +* Fri Oct 06 2000 Matthew Miller +- v 2.4 + +* Thu Mar 23 2000 Matthew Miller +- changed so that lilo.conf isn't written if it already exists. This is + important if you're including memtest86 in a distribution +- GPG key available from http://www.bu.edu/dsgsupport/linux/BULinux-GPG-KEY +- changed name of lilo.conf backup file to something less likely to conflict + with other backups + +* Wed Mar 01 2000 Matthew Miller +- Updated to version 2.2 +- Cosmetic changes to spec file +- updated Source: to reflect actual author's url + +* Fri Dec 25 1998 Peter Soos + +- Corrected the file attributes + +* Mon Aug 17 1998 Peter Soos + +- Moved to 1.4a + +* Mon Jun 22 1998 Peter Soos + +- Moved to 1.4 + +* Wed Dec 31 1997 Peter Soos + +- Initial version diff --git a/new-memtest-pkg b/new-memtest-pkg new file mode 100755 index 0000000..bcbf261 --- /dev/null +++ b/new-memtest-pkg @@ -0,0 +1,339 @@ +#!/bin/bash +# +# Invoked upon installation or removal of a kernel package, the following +# tasks are/can be done here: +# creation/removal of initrd +# run of depmod/removal of depmod generated files +# addition/removal of kernel images from grub/lilo configuration (via grubby) +# +# Copyright (C) 2002, 2003 Red Hat, Inc. +# + +PATH=/sbin:/bin:$PATH + +lilo=/sbin/lilo + +# some defaults that are sane for most arches +kernelName=memtest86+ + +if [ -x ./grubby ]; then + grubby=./grubby +else + grubby=/sbin/grubby +fi + +cfgGrub="" +cfgLilo="" +runLilo="" +grubConfig="" + +ARCH=$(uname -m) + +if [ $ARCH = 'ia64' ]; then + liloConfig=/boot/efi/EFI/redhat/elilo.conf + bootPrefix=/boot/efi/EFI/redhat + liloFlag=elilo + isx86="" +elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then + liloConfig=/etc/yaboot.conf + bootPrefix=/boot + lilo=/sbin/ybin + kernelName=vmlinux + liloFlag=yaboot + runLilo="yes" + isx86="" +elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then + liloConfig=/etc/silo.conf + bootPrefix=/boot + liloFlag=silo + lilo=/sbin/silo + isx86="" +elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then + liloConfig=/etc/zipl.conf + bootPrefix=/boot + liloFlag=zipl + lilo=/sbin/zipl + runLilo="yes" + isx86="" +else + # this leaves i?86 and x86_64 + liloConfig=/etc/lilo.conf + grubConfig=/boot/grub/grub.conf + bootPrefix=/boot + liloFlag=lilo + isx86="yes" +fi + +mode="" +version="" +initrd="" +initrdfile="" +moddep="" +verbose="" + +usage() { + echo "Usage: `basename $0` [-v] [--mkinitrd] [--rminitrd]" >&2 + echo " [--initrdfile=] [--depmod] [--rmmoddep]" >&2 + echo " [--kernel-args=] [--banner=]" >&2 + echo " <--install | --remove> " >&2 + echo " (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2 + exit 1 +} + +install() { + # XXX kernel should be able to be specified also (or work right on ia64) + if [ ! -f $bootPrefix/$kernelName-$version ] ; then + [ -n "$verbose" ] && echo "kernel for $version does not exist, not running grubby" + return + fi + + INITRD="" + if [ -f $initrdfile ]; then + [ -n "$verbose" ] && echo "found $initrdfile and using it with grubby" + INITRD="--initrd $initrdfile" + fi + + # FIXME: is this a good heuristic to find out if we're on iSeries? + if [ -d /proc/iSeries ]; then + [ -n "$verbose" ] && echo "On an iSeries, just making img file" + if [ -z $initrdfile ]; then + [ -n "$verbose" ] && echo "No initrd, just adding system map" + /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version + else + /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version + /sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null + rm $bootPrefix/vmlinux.sm-$version + fi + return + fi + + # get the root filesystem to use; if it's on a label make sure it's + # been configured. if not, get the root device from mount + rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab) + short=$(echo $rootdevice | cut -d= -f1) + if [ "$short" == "LABEL" ]; then + label=$(echo $rootdevice | cut -d= -f2 |head -n 1) + device=$(echo "showlabels" | /sbin/nash --force --quiet | + awk '$2 == "'$label'" {print $1}') + if [ -z "$device" ]; then + rootdevice=$(mount | awk '$3 == "/" { print $1 }') + fi + fi + + if [ -n "$cfgGrub" ]; then + [ -n "$verbose" ] && echo "adding $version to $grubConfig" + + if [ -n "$banner" ]; then + title="$banner ($version)" + elif [ -f /etc/redhat-release ]; then + title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)" + else + title="Red Hat Linux ($version)" + fi + /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ + --copy-default --title "$title" \ + --args="root=$rootdevice $kernargs" \ + --remove-kernel="TITLE=$title" + else + [ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby" + fi + + if [ -n "$cfgLilo" ]; then + [ -n "$verbose" ] && echo "adding $version to $liloConfig" + + /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ + --copy-default --title $version \ + --args="root=$rootdevice $kernargs" \ + --remove-kernel="TITLE=$version" \ + --$liloFlag + + if [ -n "$runLilo" ]; then + [ -n "$verbose" ] && echo "running $lilo" + if [ ! -x $lilo ] ; then + [ -n "$verbose" ] && echo "$lilo does not exist" + else + $lilo > /dev/null + fi + fi + else + [ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby" + fi + +} + +remove() { + # FIXME: is this a good heuristic to find out if we're on iSeries? + if [ -d /proc/iSeries ]; then + [ -n "$verbose" ] && echo "On an iSeries, remove img file" + rm -f $bootPrefix/$kernelName-$version.img 2>/dev/null + return + fi + + if [ -n "$cfgGrub" ]; then + [ -n "$verbose" ] && echo "removing $version from $grubConfig" + /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version + else + [ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby" + fi + + if [ -n "$cfgLilo" ]; then + [ -n "$verbose" ] && echo "removing $version from $liloConfig" + /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version \ + --$liloFlag + + if [ -n "$runLilo" ]; then + [ -n "$verbose" ] && echo "running $lilo" + if [ ! -x $lilo ] ; then + [ -n "$verbose" ] && echo "$lilo does not exist" + else + $lilo > /dev/null + fi + fi + else + [ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby" + fi +} + +mkinitrd() { + [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version" + /sbin/mkinitrd -f $initrdfile $version + rc=$? + if [ $rc != 0 ]; then + echo "mkinitrd failed" >&2 + exit 1 + fi +} + +rminitrd() { + [ -n "$verbose" ] && echo "removing initrd $initrdfile" + [ -f $initrdfile ] && rm -f $initrdfile +} + +doDepmod() { + [ -n "$verbose" ] && echo "running depmod for $version" + depmod -ae -F /boot/System.map-$version $version +} + +doRmmoddep() { + [ -n "$verbose" ] && echo "removing modules.dep info for $version" + [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.* +} + + +while [ $# -gt 0 ]; do + case $1 in + --mkinitrd) + initrd="make" + ;; + + --rminitrd) + initrd="remove" + ;; + + --initrdfile*) + if echo $1 | grep '=' >/dev/null ; then + initrdfile=`echo $1 | sed 's/^--initrdfile=//'` + else + initrdfile=$2 + shift + fi + ;; + + --kernel-args*) + if echo $1 | grep '=' >/dev/null ; then + kernargs=`echo $1 | sed 's/^--kernel-args=//'` + else + kernargs=$2 + shift + fi + ;; + + --banner*) + if echo $1 | grep '=' >/dev/null ; then + banner=`echo $1 | sed 's/^--banner=//'` + else + banner=$2 + shift + fi + ;; + + --depmod) + moddep="make" + ;; + + --rmmoddep) + moddep="remove" + ;; + + -v) + verbose=-v + ;; + + *) + if [ -z "$mode" ]; then + mode=$1 + elif [ -z "$version" ]; then + version=$1 + else + usage + fi + ;; + esac + + shift +done + +# make sure the mode is valid +if [ "$mode" != "--install" -a "$mode" != "--remove" ] ; then + usage +fi + +if [ -z "$version" ]; then + usage +fi + +# set the initrd file based on arch; ia64 is the only currently known oddball +if [ -z "$initrdfile" ]; then + if [ `uname -m` = "ia64" ]; then + initrdfile="/boot/efi/EFI/redhat/initrd-$version.img" + else + initrdfile="/boot/initrd-$version.img" + fi + +fi +[ -n "$verbose" ] && echo "initrdfile is $initrdfile" + +if [ "$moddep" == "make" ]; then + doDepmod +elif [ "$moddep" == "remove" ]; then + doRmmoddep +fi + +if [ "$initrd" == "make" ]; then + mkinitrd +elif [ "$initrd" == "remove" ]; then + rminitrd +fi + +if [ ! -x $grubby ] ; then + [ -n "$verbose" ] && echo "$grubby does not exist" + exit 0 +fi + + +[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1; +[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1; + +# if we have a lilo config on an x86 box, see if the default boot loader +# is lilo to determine if it should be run +if [ -n "$cfgLilo" -a -n "$isx86" ]; then + runLilo=$($grubby --bootloader-probe | grep lilo) +fi + +if [ "$mode" == "--install" ]; then + install +elif [ "$mode" == "--remove" ]; then + remove +fi + +exit 0 diff --git a/sources b/sources index e69de29..508f065 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +55246f7734daedd88abe97a2b1cf98d9 memtest_source_v1.11.tar.gz