From 902e78da8cda7fadd3841cbe5473d60e07229f1c Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 12 Jun 2013 14:39:31 -0400
Subject: [PATCH 481/482] Revert "Add bootpath device to the list" (#967862)

commit c6e8465f fixes this issue.

This reverts commit a2780be06f7de35a0dd4cc19a68b151176707ae7.
---
 grub-core/disk/ieee1275/ofdisk.c | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
index a940771..2a31ecd 100644
--- a/grub-core/disk/ieee1275/ofdisk.c
+++ b/grub-core/disk/ieee1275/ofdisk.c
@@ -229,10 +229,6 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
 static void
 scan (void)
 {
-  char *bootpath;
-  int bootpath_size;
-  char *type;
-
   struct grub_ieee1275_devalias alias;
   FOR_IEEE1275_DEVALIASES(alias)
     {
@@ -243,34 +239,6 @@ scan (void)
 
   FOR_IEEE1275_DEVCHILDREN("/", alias)
     dev_iterate (&alias);
-
-  if (grub_ieee1275_get_property_length (grub_ieee1275_chosen, "bootpath",
-					 &bootpath_size)
-      || bootpath_size <= 0)
-    {
-      /* Should never happen.  */
-      grub_printf ("/chosen/bootpath property missing!\n");
-      return;
-    }
-
-  bootpath = (char *) grub_malloc ((grub_size_t) bootpath_size + 64);
-  if (! bootpath)
-    {
-      grub_print_error ();
-      return;
-    }
-  grub_ieee1275_get_property (grub_ieee1275_chosen, "bootpath", bootpath,
-                              (grub_size_t) bootpath_size + 1, 0);
-  bootpath[bootpath_size] = '\0';
-
-  type = grub_ieee1275_get_device_type (bootpath);
-  if (type && grub_strcmp (type, "block") == 0)
-      dev_iterate_real (bootpath, bootpath);
-
-  grub_free (bootpath);
-
-  grub_devalias_iterate (dev_iterate_alias);
-  grub_children_iterate ("/", dev_iterate);
 }
 
 static int
-- 
1.8.2.1