2010-09-09 Robert Millan <rmh@gnu.org>
* util/grub-probe.c (probe): Fix a pair of unhandled error conditions.
This commit is contained in:
parent
4dfbc57428
commit
7bf45fdd31
2 changed files with 9 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2010-09-09 Robert Millan <rmh@gnu.org>
|
||||||
|
|
||||||
|
* util/grub-probe.c (probe): Fix a pair of unhandled error
|
||||||
|
conditions.
|
||||||
|
|
||||||
2010-09-09 Robert Millan <rmh@gnu.org>
|
2010-09-09 Robert Millan <rmh@gnu.org>
|
||||||
|
|
||||||
Basic Btrfs support (detection and UUID).
|
Basic Btrfs support (detection and UUID).
|
||||||
|
|
|
@ -234,7 +234,8 @@ probe (const char *path, char *device_name)
|
||||||
if (! fs->uuid)
|
if (! fs->uuid)
|
||||||
grub_util_error ("%s does not support UUIDs", fs->name);
|
grub_util_error ("%s does not support UUIDs", fs->name);
|
||||||
|
|
||||||
fs->uuid (dev, &uuid);
|
if (fs->uuid (dev, &uuid) != GRUB_ERR_NONE)
|
||||||
|
grub_util_error ("%s", grub_errmsg);
|
||||||
|
|
||||||
printf ("%s\n", uuid);
|
printf ("%s\n", uuid);
|
||||||
}
|
}
|
||||||
|
@ -244,7 +245,8 @@ probe (const char *path, char *device_name)
|
||||||
if (! fs->label)
|
if (! fs->label)
|
||||||
grub_util_error ("%s does not support labels", fs->name);
|
grub_util_error ("%s does not support labels", fs->name);
|
||||||
|
|
||||||
fs->label (dev, &label);
|
if (fs->label (dev, &label) != GRUB_ERR_NONE)
|
||||||
|
grub_util_error ("%s", grub_errmsg);
|
||||||
|
|
||||||
printf ("%s\n", label);
|
printf ("%s\n", label);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue