diff --git a/memtest-setup b/memtest-setup index be50310..b308d2f 100755 --- a/memtest-setup +++ b/memtest-setup @@ -32,7 +32,7 @@ if [ "$RETVAL" != "0" ]; then echo "ERROR: grubby failed to configure your bootloader for $MTPATH." exit $RETVAL else - sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf + sed -i -e"s,kernel \(/boot\)\?/$ENAME,kernel --type=netbsd \1/$ENAME," /boot/grub/grub.conf sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf fi diff --git a/memtest86+.spec b/memtest86+.spec index 8ac24c3..dac9f8a 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -7,7 +7,7 @@ Name: memtest86+ Version: 4.00 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Summary: Stand-alone memory tester for x86 and x86-64 computers Group: System Environment/Base @@ -84,6 +84,10 @@ rm -rf %{buildroot} %changelog +* Tue Oct 13 2009 Jarod Wilson - 4.00-2 +- Fix memtest-setup on systems without a separate /boot + filesystem (#528651) + * Tue Sep 29 2009 Jarod Wilson - 4.00-1 - Update to new upstream release, v4.00 - Drop gcc4.2+ patch, merged upstream