vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/disk/ieee1275/ofdisk.c (scan): Fix improper use of device

Browse source 
name as if it was an alias.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 16:51:25 +01:00
parent 114076ef63
commit 0ec820904e
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/ieee1275/ofdisk.c (scan): Fix improper use of device
name as if it was an alias.
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/lsacpi.c (options): Fix typo. * grub-core/commands/lsacpi.c (options): Fix typo.

26
grub-core/disk/ieee1275/ofdisk.c
View file

@ -115,26 +115,24 @@ ofdisk_hash_add (char *devpath, char *curcan)
static void static void
scan (void) scan (void)
{ {
auto int dev_iterate (struct grub_ieee1275_devalias *alias); auto int dev_iterate_real (struct grub_ieee1275_devalias *alias,
int use_name);
int dev_iterate (struct grub_ieee1275_devalias *alias) int dev_iterate_real (struct grub_ieee1275_devalias *alias, int use_name)
{ {
struct ofdisk_hash_ent *op; struct ofdisk_hash_ent *op;
grub_dprintf ("disk", "device name = %s type = %s\n", alias->name,
alias->type);
if (grub_strcmp (alias->type, "block") != 0) if (grub_strcmp (alias->type, "block") != 0)
return 0; return 0;
grub_dprintf ("disk", "disk name = %s\n", alias->name);
grub_dprintf ("disk", "disk name = %s, path = %s\n", alias->name, grub_dprintf ("disk", "disk name = %s, path = %s\n", alias->name,
alias->path); alias->path);
op = ofdisk_hash_find (alias->name); op = ofdisk_hash_find (alias->path);
if (!op) if (!op)
{ {
char *name = grub_strdup (alias->name); char *name = grub_strdup (use_name ? alias->name : alias->path);
char *can = grub_strdup (alias->path); char *can = grub_strdup (alias->path);
if (!name || !can) if (!name || !can)
{ {
@ -148,7 +146,19 @@ scan (void)
return 0; return 0;
} }
grub_devalias_iterate (dev_iterate); auto int dev_iterate_alias (struct grub_ieee1275_devalias *alias);
int dev_iterate_alias (struct grub_ieee1275_devalias *alias)
{
return dev_iterate_real (alias, 1);
}
auto int dev_iterate (struct grub_ieee1275_devalias *alias);
int dev_iterate (struct grub_ieee1275_devalias *alias)
{
return dev_iterate_real (alias, 0);
}
grub_devalias_iterate (dev_iterate_alias);
grub_ieee1275_devices_iterate (dev_iterate); grub_ieee1275_devices_iterate (dev_iterate);
} }