rpms/grub/devel grub-install_virtio_blk_support.patch, NONE, 1.1 grub.spec, 1.95, 1.96

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3281

Modified Files:
	grub.spec 
Added Files:
	grub-install_virtio_blk_support.patch 
Log Message:
* Wed Apr 29 2009 Peter Jones <pjones at redhat.com> - 0.97-50
- Handle virtio_blk disks and their crazy new device name in grub-install
  (rhbz#479760)


grub-install_virtio_blk_support.patch:

--- NEW FILE grub-install_virtio_blk_support.patch ---
diff -ur grub-0.97.orig/util/grub-install.in grub-0.97/util/grub-install.in
--- grub-0.97.orig/util/grub-install.in	2009-01-12 21:47:56.000000000 -0500
+++ grub-0.97/util/grub-install.in	2009-01-12 21:48:16.000000000 -0500
@@ -102,7 +102,7 @@
     linux*)
 	tmp_disk=`echo "$1" | grep -v '/mapper/control$' |
 		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
-		sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+		sed -e 's%\([shv]d[a-z]\)[0-9]*$%\1%' \
 				  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
 				  -e 's%\(fd[0-9]*\)$%\1%' \
 				  -e 's%/part[0-9]*$%/disc%' \
@@ -112,7 +112,7 @@
 	  -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
 	tmp_part=`echo "$1" | grep -v '/mapper/control$' |
 		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
-		sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
+		sed -e 's%.*/[shv]d[a-z]\([0-9]*\)$%\1%' \
 				  -e 's%.*d[0-9]*p%%' \
 				  -e 's%.*/fd[0-9]*$%%' \
 				  -e 's%.*/floppy/[0-9]*$%%' \


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- grub.spec	16 Apr 2009 20:38:11 -0000	1.95
+++ grub.spec	29 Apr 2009 21:27:56 -0000	1.96
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 49%{?dist}
+Release: 50%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -41,6 +41,7 @@ Patch12: grub-0.97-fat-lowercase.patch
 Patch13: grub-0.97-efipxe.patch
 Patch14: grub-0.97-tolower.patch
 Patch15: grub-low-memory.patch
+Patch16: grub-install_virtio_blk_support.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -66,6 +67,7 @@ systems.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 autoreconf
@@ -128,6 +130,10 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Wed Apr 29 2009 Peter Jones <pjones at redhat.com> - 0.97-50
+- Handle virtio_blk disks and their crazy new device name in grub-install
+  (rhbz#479760)
+
 * Thu Apr 16 2009 Peter Jones <pjones at redhat.com> - 0.97-49
 - Fix efi booting on machines with continguous memory regions across
   the 1G boundary.