From 008a5c45cb0df13b9dbe43f0c549835cadbc46ad Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Jun 04 2012 16:38:39 +0000
Subject: Handle ppc nvram stuff in anaconda instead of here.


---

diff --git a/grub-2.00-Dont-set-boot-on-ppc.patch b/grub-2.00-Dont-set-boot-on-ppc.patch
deleted file mode 100644
index c2051f4..0000000
--- a/grub-2.00-Dont-set-boot-on-ppc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 28d9f3965f095a765ec8aaa589b4e04608b69901 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 25 May 2012 14:57:38 -0400
-Subject: [PATCH] Don't set boot device on ppc-ieee1275
-
-This started with the problem that powerkvm doesn't have /dev/nvram and so
-there is no way to set boot-device.
----
- util/grub-install.in |   18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/util/grub-install.in b/util/grub-install.in
-index 293b756..2503aa0 100644
---- a/util/grub-install.in
-+++ b/util/grub-install.in
-@@ -818,14 +818,16 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
- 	    }
- 	fi
- 
--	"$nvsetenv" boot-device "$boot_device" || {
--	    # TRANSLATORS: The %s will be replaced by an external program name.
--	    gettext_printf "\`%s' failed.\n" "$nvsetenv" 1>&2
--	    gettext "You will have to set \`boot-device' variable manually.  At the IEEE1275 prompt, type:" 1>&2
--	    echo 1>&2
--	    echo "  setenv boot-device $boot_device" 1>&2
--	    exit 1
--	}
-+	if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]; then
-+	    "$nvsetenv" boot-device "$boot_device" || {
-+	        # TRANSLATORS: The %s will be replaced by an external program name.
-+	        gettext_printf "\`%s' failed.\n" "$nvsetenv" 1>&2
-+	        gettext "You will have to set \`boot-device' variable manually.  At the IEEE1275 prompt, type:" 1>&2
-+	        echo 1>&2
-+	        echo "  setenv boot-device $boot_device" 1>&2
-+	        exit 1
-+	    }
-+	fi
-     fi
- elif [ x"${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = xmips-arc ]; then
-     dvhtool -d "${install_device}" --unix-to-vh "{grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" grub
--- 
-1.7.10.1
-
diff --git a/grub2.spec b/grub2.spec
index 045f44c..cf28ae9 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -56,7 +56,6 @@ Patch2:		grub-1.99-just-say-linux.patch
 Patch5:		grub-1.99-ppc-terminfo.patch
 Patch10:	grub-2.00-add-fw_path-search.patch
 Patch11:	grub-2.00-Add-fwsetup.patch
-Patch13:	grub-2.00-Dont-set-boot-on-ppc.patch
 Patch14:	grub-2.00-ignore-gnulib-gets-stupidity.patch
 Patch15:	grub-2.00-linux-mbr.patch
 Patch16:	grub-2.00-no-huge-video.patch
@@ -388,6 +387,7 @@ fi
 * Mon Jun 04 2012 Peter Jones <pjones@redhat.com> - 2.0-0.33.beta6
 - Update to beta6.
 - Various fixes from mads.
+- Handle ppc nvram differently
 
 * Fri May 25 2012 Peter Jones <pjones@redhat.com> - 2.0-0.32.beta5
 - Revert builddep change for crt1.o; it breaks ppc build.