|
 |
f74b50e |
From 902e78da8cda7fadd3841cbe5473d60e07229f1c Mon Sep 17 00:00:00 2001
|
|
|
f74b50e |
From: Peter Jones <pjones@redhat.com>
|
|
|
f74b50e |
Date: Wed, 12 Jun 2013 14:39:31 -0400
|
|
|
f74b50e |
Subject: [PATCH 481/482] Revert "Add bootpath device to the list" (#967862)
|
|
|
f74b50e |
|
|
|
f74b50e |
commit c6e8465f fixes this issue.
|
|
|
f74b50e |
|
|
|
f74b50e |
This reverts commit a2780be06f7de35a0dd4cc19a68b151176707ae7.
|
|
|
f74b50e |
---
|
|
|
f74b50e |
grub-core/disk/ieee1275/ofdisk.c | 32 --------------------------------
|
|
|
f74b50e |
1 file changed, 32 deletions(-)
|
|
|
f74b50e |
|
|
|
f74b50e |
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
|
|
|
f74b50e |
index a940771..2a31ecd 100644
|
|
|
f74b50e |
--- a/grub-core/disk/ieee1275/ofdisk.c
|
|
|
f74b50e |
+++ b/grub-core/disk/ieee1275/ofdisk.c
|
|
|
f74b50e |
@@ -229,10 +229,6 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
|
|
|
f74b50e |
static void
|
|
|
f74b50e |
scan (void)
|
|
|
f74b50e |
{
|
|
|
f74b50e |
- char *bootpath;
|
|
|
f74b50e |
- int bootpath_size;
|
|
|
f74b50e |
- char *type;
|
|
|
f74b50e |
-
|
|
|
f74b50e |
struct grub_ieee1275_devalias alias;
|
|
|
f74b50e |
FOR_IEEE1275_DEVALIASES(alias)
|
|
|
f74b50e |
{
|
|
|
f74b50e |
@@ -243,34 +239,6 @@ scan (void)
|
|
|
f74b50e |
|
|
|
f74b50e |
FOR_IEEE1275_DEVCHILDREN("/", alias)
|
|
|
f74b50e |
dev_iterate (&alias);
|
|
|
f74b50e |
-
|
|
|
f74b50e |
- if (grub_ieee1275_get_property_length (grub_ieee1275_chosen, "bootpath",
|
|
|
f74b50e |
- &bootpath_size)
|
|
|
f74b50e |
- || bootpath_size <= 0)
|
|
|
f74b50e |
- {
|
|
|
f74b50e |
- /* Should never happen. */
|
|
|
f74b50e |
- grub_printf ("/chosen/bootpath property missing!\n");
|
|
|
f74b50e |
- return;
|
|
|
f74b50e |
- }
|
|
|
f74b50e |
-
|
|
|
f74b50e |
- bootpath = (char *) grub_malloc ((grub_size_t) bootpath_size + 64);
|
|
|
f74b50e |
- if (! bootpath)
|
|
|
f74b50e |
- {
|
|
|
f74b50e |
- grub_print_error ();
|
|
|
f74b50e |
- return;
|
|
|
f74b50e |
- }
|
|
|
f74b50e |
- grub_ieee1275_get_property (grub_ieee1275_chosen, "bootpath", bootpath,
|
|
|
f74b50e |
- (grub_size_t) bootpath_size + 1, 0);
|
|
|
f74b50e |
- bootpath[bootpath_size] = '\0';
|
|
|
f74b50e |
-
|
|
|
f74b50e |
- type = grub_ieee1275_get_device_type (bootpath);
|
|
|
f74b50e |
- if (type && grub_strcmp (type, "block") == 0)
|
|
|
f74b50e |
- dev_iterate_real (bootpath, bootpath);
|
|
|
f74b50e |
-
|
|
|
f74b50e |
- grub_free (bootpath);
|
|
|
f74b50e |
-
|
|
|
f74b50e |
- grub_devalias_iterate (dev_iterate_alias);
|
|
|
f74b50e |
- grub_children_iterate ("/", dev_iterate);
|
|
|
f74b50e |
}
|
|
|
f74b50e |
|
|
|
f74b50e |
static int
|
|
|
f74b50e |
--
|
|
|
f74b50e |
1.8.2.1
|
|
|
f74b50e |
|