119 lines
3.2 KiB
Diff
119 lines
3.2 KiB
Diff
From c6e8465f8455e0f9a327226f32c9ad3e26484b9e Mon Sep 17 00:00:00 2001
|
|
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
Date: Sun, 14 Apr 2013 16:55:20 +0200
|
|
Subject: [PATCH 302/482] * grub-core/disk/ieee1275/ofdisk.c: Iterate
|
|
over bootpath even if it would be otherwise excluded.
|
|
|
|
---
|
|
ChangeLog | 7 +++++-
|
|
grub-core/disk/ieee1275/ofdisk.c | 49 +++++++++++++++++++++++++++++++++++++---
|
|
2 files changed, 52 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 9df4d1e..1088061 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,4 +1,9 @@
|
|
-2013-04-13 Vladimir Serbinenko <phcoder@gmail.com>
|
|
+2013-04-14 Vladimir Serbinenko <phcoder@gmail.com>
|
|
+
|
|
+ * grub-core/disk/ieee1275/ofdisk.c: Iterate over bootpath even if it
|
|
+ would be otherwise excluded.
|
|
+
|
|
+2013-04-14 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options):
|
|
Inline name defines used only once.
|
|
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
|
|
index 1d4de90..bebf777 100644
|
|
--- a/grub-core/disk/ieee1275/ofdisk.c
|
|
+++ b/grub-core/disk/ieee1275/ofdisk.c
|
|
@@ -31,6 +31,7 @@ static grub_ieee1275_ihandle_t last_ihandle;
|
|
struct ofdisk_hash_ent
|
|
{
|
|
char *devpath;
|
|
+ int is_boot;
|
|
/* Pointer to shortest available name on nodes representing canonical names,
|
|
otherwise NULL. */
|
|
const char *shortest;
|
|
@@ -69,13 +70,12 @@ ofdisk_hash_add_real (char *devpath)
|
|
struct ofdisk_hash_ent *p;
|
|
struct ofdisk_hash_ent **head = &ofdisk_hash[ofdisk_hash_fn(devpath)];
|
|
|
|
- p = grub_malloc(sizeof (*p));
|
|
+ p = grub_zalloc (sizeof (*p));
|
|
if (!p)
|
|
return NULL;
|
|
|
|
p->devpath = devpath;
|
|
p->next = *head;
|
|
- p->shortest = 0;
|
|
*head = p;
|
|
return p;
|
|
}
|
|
@@ -267,7 +267,8 @@ grub_ofdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
|
|
}
|
|
}
|
|
|
|
- if (grub_strncmp (ent->shortest, "cdrom", 5) == 0)
|
|
+ if (grub_strncmp (ent->shortest, "cdrom", 5) == 0
|
|
+ || ent->is_boot)
|
|
continue;
|
|
|
|
{
|
|
@@ -491,9 +492,51 @@ static struct grub_disk_dev grub_ofdisk_dev =
|
|
.next = 0
|
|
};
|
|
|
|
+static void
|
|
+insert_bootpath (void)
|
|
+{
|
|
+ char *bootpath;
|
|
+ grub_ssize_t bootpath_size;
|
|
+ char *type;
|
|
+
|
|
+ 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';
|
|
+
|
|
+ /* Transform an OF device path to a GRUB path. */
|
|
+
|
|
+ type = grub_ieee1275_get_device_type (bootpath);
|
|
+ if (!(type && grub_strcmp (type, "network") == 0))
|
|
+ {
|
|
+ struct ofdisk_hash_ent *op;
|
|
+ char *device = grub_ieee1275_get_devname (bootpath);
|
|
+ op = ofdisk_hash_add (device, NULL);
|
|
+ op->is_boot = 1;
|
|
+ }
|
|
+ grub_free (type);
|
|
+ grub_free (bootpath);
|
|
+}
|
|
+
|
|
void
|
|
grub_ofdisk_init (void)
|
|
{
|
|
+ insert_bootpath ();
|
|
+
|
|
grub_disk_dev_register (&grub_ofdisk_dev);
|
|
}
|
|
|
|
--
|
|
1.8.2.1
|
|
|