From 2f2c551902788f26fcc67a25d640315a8e570946 Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <mads@kiilerich.com>
Date: Jun 01 2012 16:38:29 +0000
Subject: drop grub-1.99-Fix-tests-of-zeroed-partition.patch fixed upstream


revno: 4325
committer: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
branch nick: grub
timestamp: Fri 2012-05-11 21:07:39 +0200
message:
  	Use grub-probe and not cmp to check that disk is empty.

  	* util/grub-install.in: Use grub-probe for zero-check.
  	* util/grub-probe.c (PRINT_ZERO_CHECK): New enum value.
  	(probe): Handle PRINT_ZERO_CHECK.
  	(argp_parser): Handle -t zero_check.

---

diff --git a/grub-1.99-Fix-tests-of-zeroed-partition.patch b/grub-1.99-Fix-tests-of-zeroed-partition.patch
deleted file mode 100644
index 343c378..0000000
--- a/grub-1.99-Fix-tests-of-zeroed-partition.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c8f67c2ee40815c075f1d6e5b3d6b504fbe204f5 Mon Sep 17 00:00:00 2001
-From: Mark Hamzy <hamzy@us.ibm.com>
-Date: Sun, 25 Mar 2012 09:22:34 -0500
-Subject: [PATCH] Fix tests of zeroed partition
-
----
- util/grub-install.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/util/grub-install.in b/util/grub-install.in
-index 9c1d133..e8638af 100644
---- a/util/grub-install.in
-+++ b/util/grub-install.in
-@@ -750,7 +750,7 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
- 		exit 1
-             fi
- 
--            if [ "$(file -s "${install_device}" -b | awk '{ print $1 }')" = ELF ] || [ $(cmp /dev/zero "${install_device}" &>/dev/null) ]; then
-+            if [ "$(file -s "${install_device}" -b | awk '{ print $1 }')" = ELF ] || (cmp -s -n $(blockdev --getsize64 ${install_device}) /dev/zero "${install_device}"); then
-             # Change boot device to the harddisk root
- 		boot_device="$ofpath"
- 		dd if="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" of="${install_device}" status=noxfer || {
--- 
-1.7.7.2
-
diff --git a/grub2.spec b/grub2.spec
index 6b24284..84de407 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -51,7 +51,6 @@ Source3:        README.Fedora
 Source4:	http://unifoundry.com/unifont-5.1.20080820.pcf.gz
 Source5:	theme.tar.bz2
 Patch2:		grub-1.99-just-say-linux.patch
-Patch4:		grub-1.99-Fix-tests-of-zeroed-partition.patch
 Patch5:		grub-1.99-ppc-terminfo.patch
 Patch7:		grub-2.00~beta4-add-support-for-PowerMac-HFS-partitions.patch
 Patch8:		grub2-2.0-no-png-in-texi.patch