From 5028d8c9e5aa71768abaf1e2b905ff9aa8f169dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 11 Nov 2009 15:38:16 +0000 Subject: [PATCH] - find pld initrd images with grub-install; rel 2 Changed files: grub2.spec -> 1.53 pld-initrd.patch -> 1.1 --- grub2.spec | 8 +++++--- pld-initrd.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pld-initrd.patch diff --git a/grub2.spec b/grub2.spec index d243903..7fa6a52 100644 --- a/grub2.spec +++ b/grub2.spec @@ -11,7 +11,7 @@ Summary(pl.UTF-8): GRUB2 - bootloader dla x86 i ppc Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2 Name: grub2 Version: 1.97.1 -Release: 1 +Release: 2 License: GPL v2 Group: Base # svn export svn://svn.sv.gnu.org/grub/trunk/grub2 @@ -20,6 +20,7 @@ Source0: http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz # Source0-md5: 66fe18cd9318e3d67a34d7b7a8e7b1f6 URL: http://www.gnu.org/software/grub/grub-2.en.html BuildRequires: autoconf >= 2.53 +Patch0: pld-initrd.patch BuildRequires: automake BuildRequires: bison BuildRequires: gawk @@ -99,6 +100,7 @@ avançados e que querem mais recursos de seu boot loader. %prep %setup -q -n grub-%{version} +%patch0 -p1 %build cp -f /usr/share/automake/config.sub . @@ -143,10 +145,10 @@ rm $RPM_BUILD_ROOT%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p %{_sbindir}/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p %{_sbindir}/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files diff --git a/pld-initrd.patch b/pld-initrd.patch new file mode 100644 index 0000000..fa66f33 --- /dev/null +++ b/pld-initrd.patch @@ -0,0 +1,11 @@ +--- grub-1.97.1/util/grub.d/10_linux.in~ 2009-11-09 17:48:16.000000000 +0200 ++++ grub-1.97.1/util/grub.d/10_linux.in 2009-11-11 17:36:26.000000000 +0200 +@@ -77,7 +77,7 @@ + + initrd= + for i in "initrd.img-${version}" "initrd-${version}.img" \ +- "initrd-${version}" "initrd.img-${alt_version}" \ ++ "initrd-${version}" "initrd.img-${alt_version}" "initrd-${version}.gz" \ + "initrd-${alt_version}.img" "initrd-${alt_version}"; do + if test -e "${dirname}/${i}" ; then + initrd="$i" -- 2.44.0