rpms/grub2/devel grub-1.97.1-initramfs.patch, NONE, 1.1 grub2.spec, 1.12, 1.13

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/grub2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1695

Modified Files:
	grub2.spec 
Added Files:
	grub-1.97.1-initramfs.patch 
Log Message:
add patch for initramfs support


grub-1.97.1-initramfs.patch:
 10_linux.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE grub-1.97.1-initramfs.patch ---
diff -uNr grub-1.97.1-orig/util/grub.d/10_linux.in grub-1.97.1/util/grub.d/10_linux.in
--- grub-1.97.1-orig/util/grub.d/10_linux.in	2009-11-09 09:48:16.000000000 -0600
+++ grub-1.97.1/util/grub.d/10_linux.in	2009-12-01 15:28:16.000000000 -0600
@@ -78,7 +78,8 @@
   initrd=
   for i in "initrd.img-${version}" "initrd-${version}.img" \
 	   "initrd-${version}" "initrd.img-${alt_version}" \
-	   "initrd-${alt_version}.img" "initrd-${alt_version}"; do
+	   "initrd-${alt_version}.img" "initrd-${alt_version}" \
+           "initramfs-${version}.img" ; do
     if test -e "${dirname}/${i}" ; then
       initrd="$i"
       break


Index: grub2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/devel/grub2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- grub2.spec	10 Nov 2009 22:54:45 -0000	1.12
+++ grub2.spec	1 Dec 2009 21:33:09 -0000	1.13
@@ -14,7 +14,7 @@
 Name:           grub2
 Epoch:          1
 Version:        1.97.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -25,7 +25,8 @@ Source1:        90_persistent
 Source2:        grub.default
 Source3:        README.Fedora
 Patch0:         grub-1.95-grubdir.patch
-Patch1:        http://fedorapeople.org/~lkundrak/grub2/grub2-dlsym-v4.patch
+Patch1:         http://fedorapeople.org/~lkundrak/grub2/grub2-dlsym-v4.patch
+Patch2:         grub-1.97.1-initramfs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +65,7 @@ file that is part of this package's docu
 
 %patch0 -p1 -b .grubdir
 %patch1 -p1 -b .dlsym
+%patch2 -p1 -b .initramfs
 
 # README.Fedora
 cp %{SOURCE3} .
@@ -202,6 +204,9 @@ exec >/dev/null 2>&1
 
 
 %changelog
+* Tue Dec 01 2009 Dennis Gilmore <dennis at ausil.us> - 1:1.97.1-4
+- add patch so that grub2 finds fedora's initramfs
+
 * Tue Nov 10 2009 Dennis Gilmore <dennis at ausil.us> - 1:1.97.1-3
 - no mkrescue on sparc arches
 - ofpathname on sparc arches