rpms/memtest86+/devel memtest-setup, 1.5, 1.6 memtest86+.spec, 1.51, 1.52

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2469

Modified Files:
	memtest-setup memtest86+.spec 
Log Message:
* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
- Do the right thing in memtest-setup w/o separate /boot (#528651)



Index: memtest-setup
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest-setup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- memtest-setup	24 Apr 2009 17:33:50 -0000	1.5
+++ memtest-setup	13 Oct 2009 18:58:40 -0000	1.6
@@ -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
 


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- memtest86+.spec	29 Sep 2009 12:51:16 -0000	1.51
+++ memtest86+.spec	13 Oct 2009 18:58:40 -0000	1.52
@@ -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 <jarod at redhat.com> - 4.00-2
+- Fix memtest-setup on systems without a separate /boot
+  filesystem (#528651)
+
 * Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> - 4.00-1
 - Update to new upstream release, v4.00
 - Drop gcc4.2+ patch, merged upstream