From 1156d47d8e167fa534f7682c611cca4cae67d958 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 14 Sep 2011 16:08:42 -0400 Subject: [PATCH 1/5] Use mv not cp to try to avoid moving disk blocks around for -5 fix Related: rhbz#735259 handle initramfs on xen better (patch from Marko Ristola) Resolves: rhbz#728775 --- grub2-handle-initramfs-on-xen.patch | 16 ++++++++++++++++ grub2.spec | 11 +++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 grub2-handle-initramfs-on-xen.patch diff --git a/grub2-handle-initramfs-on-xen.patch b/grub2-handle-initramfs-on-xen.patch new file mode 100644 index 0000000..38a7df9 --- /dev/null +++ b/grub2-handle-initramfs-on-xen.patch @@ -0,0 +1,16 @@ +From: Marko Ristola +Date: 2011-08-07 07:43:01 EDT +Subject: [PATCH] Xen also uses initramfs not initrd filename + +diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in +--- a/util/grub.d/20_linux_xen.in 2011-05-17 17:10:29 +0000 ++++ b/util/grub.d/20_linux_xen.in 2011-09-14 19:02:23 +0000 +@@ -154,6 +154,7 @@ + for i in "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${version}" "initrd.img-${alt_version}" \ + "initrd-${alt_version}.img" "initrd-${alt_version}" \ ++ "initramfs-${version}.img" "initramfs-${alt_version}" \ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" ; do + if test -e "${dirname}/${i}" ; then + diff --git a/grub2.spec b/grub2.spec index 3c9629e..289856f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -18,7 +18,7 @@ Name: grub2 Epoch: 1 Version: 1.99 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -32,6 +32,7 @@ Patch0: grub-1.99-handle-fwrite-return.patch Patch1: grub-1.99-grub_test_assert_printf.patch Patch2: grub-1.99-just-say-linux.patch Patch3: grub-1.99-Workaround-for-variable-set-but-not-used-issue.patch +Patch4: grub2-handle-initramfs-on-xen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -229,7 +230,7 @@ fi %triggerun -- grub2 < 1:1.99-4 # Back up the files before uninstalling old grub2 mkdir -p /boot/grub2.tmp && -cp -a /boot/grub2/*.mod \ +mv -f /boot/grub2/*.mod \ /boot/grub2/*.img \ /boot/grub2/*.lst \ /boot/grub2/device.map \ @@ -352,6 +353,12 @@ fi %endif %changelog +* Wed Sep 14 2011 Peter Jones - 1.99-6 +- Use mv not cp to try to avoid moving disk blocks around for -5 fix + Related: rhbz#735259 +- handle initramfs on xen better (patch from Marko Ristola) + Resolves: rhbz#728775 + * Sat Sep 03 2011 Kalev Lember - 1.99-5 - Fix upgrades from grub2 < 1.99-4 (#735259) From 5606a4e17d5b5b44f04328d786bc7340678e1e6b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Oct 2011 16:58:34 -0400 Subject: [PATCH 2/5] Obsolete grub-0.97 . --- grub2.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/grub2.spec b/grub2.spec index 289856f..2694859 100644 --- a/grub2.spec +++ b/grub2.spec @@ -18,12 +18,13 @@ Name: grub2 Epoch: 1 Version: 1.99 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ URL: http://www.gnu.org/software/grub/ +Obsoletes: grub-0.97 Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz Source1: 90_persistent Source2: grub.default @@ -33,6 +34,7 @@ Patch1: grub-1.99-grub_test_assert_printf.patch Patch2: grub-1.99-just-say-linux.patch Patch3: grub-1.99-Workaround-for-variable-set-but-not-used-issue.patch Patch4: grub2-handle-initramfs-on-xen.patch +Patch5: grub2-dmraid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -353,6 +355,10 @@ fi %endif %changelog +* Thu Oct 06 2011 Peter Jones - 1.99-7 +- Obsolete grub + Resolves: rhbz#743381 + * Wed Sep 14 2011 Peter Jones - 1.99-6 - Use mv not cp to try to avoid moving disk blocks around for -5 fix Related: rhbz#735259 From 091a3cda9d29304940cf3f98626b8c8ecd23c5b5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Oct 2011 17:07:18 -0400 Subject: [PATCH 3/5] Fix extra patch added that shouldn't have gone in yet. --- grub2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/grub2.spec b/grub2.spec index 2694859..a4969fc 100644 --- a/grub2.spec +++ b/grub2.spec @@ -34,7 +34,6 @@ Patch1: grub-1.99-grub_test_assert_printf.patch Patch2: grub-1.99-just-say-linux.patch Patch3: grub-1.99-Workaround-for-variable-set-but-not-used-issue.patch Patch4: grub2-handle-initramfs-on-xen.patch -Patch5: grub2-dmraid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From ba6990d52ac3c69ddaaedf158b2f36a15273039b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Oct 2011 15:00:17 -0400 Subject: [PATCH 4/5] Fix my bad obsoletes syntax. --- grub2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grub2.spec b/grub2.spec index a4969fc..7977912 100644 --- a/grub2.spec +++ b/grub2.spec @@ -18,13 +18,13 @@ Name: grub2 Epoch: 1 Version: 1.99 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ URL: http://www.gnu.org/software/grub/ -Obsoletes: grub-0.97 +Obsoletes: grub < 0.98 Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz Source1: 90_persistent Source2: grub.default @@ -354,6 +354,9 @@ fi %endif %changelog +* Tue Oct 11 2011 Peter Jones - 1.99-8 +- Fix my bad obsoletes syntax. + * Thu Oct 06 2011 Peter Jones - 1.99-7 - Obsolete grub Resolves: rhbz#743381 From 328405c9f5f69dd1f41d5c0a742ad64bd19698de Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Oct 2011 16:53:55 -0400 Subject: [PATCH 5/5] grub has an epoch, so we need that expressed in the obsolete as well. Today isn't my day. --- grub2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/grub2.spec b/grub2.spec index 7977912..3d97cf3 100644 --- a/grub2.spec +++ b/grub2.spec @@ -18,13 +18,13 @@ Name: grub2 Epoch: 1 Version: 1.99 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ URL: http://www.gnu.org/software/grub/ -Obsoletes: grub < 0.98 +Obsoletes: grub < 1:0.98 Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz Source1: 90_persistent Source2: grub.default @@ -354,6 +354,10 @@ fi %endif %changelog +* Tue Oct 11 2011 Peter Jones - 1.99-9 +- grub has an epoch, so we need that expressed in the obsolete as well. + Today isn't my day. + * Tue Oct 11 2011 Peter Jones - 1.99-8 - Fix my bad obsoletes syntax.