rpms/grub/devel grub-0.97-dmraid-recheck-bad.patch, NONE, 1.1 grub.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8277

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-dmraid-recheck-bad.patch 
Log Message:
"fix" --recheck when using dmraid


grub-0.97-dmraid-recheck-bad.patch:
 grub-install.in |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE grub-0.97-dmraid-recheck-bad.patch ---
--- grub-0.97/util/grub-install.in.dmraid-recheck-bad	2006-01-13 17:04:26.000000000 -0500
+++ grub-0.97/util/grub-install.in	2006-01-13 17:05:00.000000000 -0500
@@ -415,6 +415,14 @@
 grubdir=${bootdir}/grub
 device_map=${grubdir}/device.map
 
+if [ "$recheck" == "yes" ]; then
+    if grep 'mapper' ${device_map} >/dev/null; then
+	echo 'grub-install does not support reprobing of device.map when' 1>&2
+	echo 'using a device-mapper based boot device.' 1>&2
+	exit 1
+    fi
+fi
+
 # if they just want the images copied, copy the images and then exit
 if test $justcopy = yes; then
     copy_images


Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- grub.spec	13 Jan 2006 21:47:22 -0000	1.33
+++ grub.spec	13 Jan 2006 22:14:04 -0000	1.34
@@ -95,6 +95,7 @@
 
 # install correctly on dmraid devices
 Patch1112: grub-0.97-dmraid.patch
+Patch1113: grub-0.97-dmraid-recheck-bad.patch
 
 ExclusiveArch: i386 x86_64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo
@@ -165,6 +166,7 @@
 %patch1111 -p1 -b .datadir
 
 %patch1112 -p1 -b .dmraid
+%patch1113 -p1 -b .dmraid-recheck-bad
 
 %build
 autoreconf --install --force