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

2008-05-31 Robert Millan <rmh@aybabtu.com>

Browse source 
* commands/search.c (search_label, search_fs_uuid, search_file): Do
        not print device names when we were asked to set a variable.
This commit is contained in:
robertmh 2008-05-31 21:08:04 +00:00
parent 6e037aa956
commit b7db5d47d9
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-05-31 Robert Millan <rmh@aybabtu.com>
* commands/search.c (search_label, search_fs_uuid, search_file): Do
not print device names when we were asked to set a variable.
2008-05-31 Robert Millan <rmh@aybabtu.com> 2008-05-31 Robert Millan <rmh@aybabtu.com>
* term/ieee1275/ofconsole.c (grub_ofconsole_setcursor): Implement * term/ieee1275/ofconsole.c (grub_ofconsole_setcursor): Implement

27
commands/search.c
View file

@ -63,9 +63,12 @@ search_label (const char *key, const char *var)
if (grub_strcmp (label, key) == 0) if (grub_strcmp (label, key) == 0)
{ {
/* Found! */ /* Found! */
grub_printf (" %s", name); if (var)
if (count++ == 0 && var) {
grub_env_set (var, name); grub_printf (" %s", name);
if (count++ == 0)
grub_env_set (var, name);
}
} }
grub_free (label); grub_free (label);
@ -111,9 +114,12 @@ search_fs_uuid (const char *key, const char *var)
if (grub_strcmp (uuid, key) == 0) if (grub_strcmp (uuid, key) == 0)
{ {
/* Found! */ /* Found! */
grub_printf (" %s", name); if (var)
if (count++ == 0 && var) {
grub_env_set (var, name); grub_printf (" %s", name);
if (count++ == 0)
grub_env_set (var, name);
}
} }
grub_free (uuid); grub_free (uuid);
@ -158,9 +164,12 @@ search_file (const char *key, const char *var)
if (file) if (file)
{ {
/* Found! */ /* Found! */
grub_printf (" %s", name); if (var)
if (count++ == 0 && var) {
grub_env_set (var, name); grub_printf (" %s", name);
if (count++ == 0)
grub_env_set (var, name);
}
grub_file_close (file); grub_file_close (file);
} }