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

Search hinting support

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-28 14:02:23 +01:00
parent 64fd18edbc
commit 7b74857658
3 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
commands/search.c
View file

@ -30,7 +30,8 @@
#include <grub/i18n.h> #include <grub/i18n.h>
void void
FUNC_NAME (const char *key, const char *var, int no_floppy) FUNC_NAME (const char *key, const char *var, int no_floppy,
const char **hints, unsigned nhints)
{ {
int count = 0; int count = 0;
char *buf = NULL; char *buf = NULL;
@ -118,22 +119,32 @@ FUNC_NAME (const char *key, const char *var, int no_floppy)
return (found && var); return (found && var);
} }
auto void try (void);
void try (void)
{
unsigned i;
for (i = 0; i < nhints; i++)
if (iterate_device (hints[i]))
return;
grub_device_iterate (iterate_device);
}
/* First try without autoloading if we're setting variable. */ /* First try without autoloading if we're setting variable. */
if (var) if (var)
{ {
saved_autoload = grub_fs_autoload_hook; saved_autoload = grub_fs_autoload_hook;
grub_fs_autoload_hook = 0; grub_fs_autoload_hook = 0;
grub_device_iterate (iterate_device); try ();
/* Restore autoload hook. */ /* Restore autoload hook. */
grub_fs_autoload_hook = saved_autoload; grub_fs_autoload_hook = saved_autoload;
/* Retry with autoload if nothing found. */ /* Retry with autoload if nothing found. */
if (grub_errno == GRUB_ERR_NONE && count == 0) if (grub_errno == GRUB_ERR_NONE && count == 0)
grub_device_iterate (iterate_device); try ();
} }
else else
grub_device_iterate (iterate_device); try ();
grub_free (buf); grub_free (buf);
@ -148,7 +159,8 @@ grub_cmd_do_search (grub_command_t cmd __attribute__ ((unused)), int argc,
if (argc == 0) if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no argument specified"); return grub_error (GRUB_ERR_BAD_ARGUMENT, "no argument specified");
FUNC_NAME (args[0], argc == 1 ? 0 : args[1], 0); FUNC_NAME (args[0], argc == 1 ? 0 : args[1], 0, (const char **) (args + 2),
argc > 2 ? argc - 2 : 0);
return grub_errno; return grub_errno;
} }
@ -165,7 +177,7 @@ GRUB_MOD_INIT(search_fs_label)
{ {
cmd = cmd =
grub_register_command (COMMAND_NAME, grub_cmd_do_search, grub_register_command (COMMAND_NAME, grub_cmd_do_search,
"NAME [VARIABLE]", "NAME [VARIABLE] [HINTS]",
"Search devices by " SEARCH_TARGET "." "Search devices by " SEARCH_TARGET "."
" If VARIABLE is specified, " " If VARIABLE is specified, "
"the first device found is set to a variable."); "the first device found is set to a variable.");

11
commands/search_wrap.c
View file

@ -62,11 +62,14 @@ grub_cmd_search (grub_extcmd_t cmd, int argc, char **args)
var = state[SEARCH_SET].arg ? state[SEARCH_SET].arg : "root"; var = state[SEARCH_SET].arg ? state[SEARCH_SET].arg : "root";
if (state[SEARCH_LABEL].set) if (state[SEARCH_LABEL].set)
grub_search_label (args[0], var, state[SEARCH_NO_FLOPPY].set); grub_search_label (args[0], var, state[SEARCH_NO_FLOPPY].set,
(const char **) (args + 1), argc - 1);
else if (state[SEARCH_FS_UUID].set) else if (state[SEARCH_FS_UUID].set)
grub_search_fs_uuid (args[0], var, state[SEARCH_NO_FLOPPY].set); grub_search_fs_uuid (args[0], var, state[SEARCH_NO_FLOPPY].set,
(const char **) (args + 1), argc - 1);
else if (state[SEARCH_FILE].set) else if (state[SEARCH_FILE].set)
grub_search_fs_file (args[0], var, state[SEARCH_NO_FLOPPY].set); grub_search_fs_file (args[0], var, state[SEARCH_NO_FLOPPY].set,
(const char **) (args + 1), argc - 1);
else else
return grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type"); return grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type");
@ -80,7 +83,7 @@ GRUB_MOD_INIT(search)
cmd = cmd =
grub_register_extcmd ("search", grub_cmd_search, grub_register_extcmd ("search", grub_cmd_search,
GRUB_COMMAND_FLAG_BOTH, GRUB_COMMAND_FLAG_BOTH,
N_("search [-f|-l|-u|-s|-n] NAME"), N_("[-f|-l|-u|-s|-n] NAME [HINTS]"),
N_("Search devices by file, filesystem label" N_("Search devices by file, filesystem label"
" or filesystem UUID." " or filesystem UUID."
" If --set is specified, the first device found is" " If --set is specified, the first device found is"

9
include/grub/search.h
View file

@ -19,8 +19,11 @@
#ifndef GRUB_SEARCH_HEADER #ifndef GRUB_SEARCH_HEADER
#define GRUB_SEARCH_HEADER 1 #define GRUB_SEARCH_HEADER 1
void grub_search_fs_file (const char *key, const char *var, int no_floppy); void grub_search_fs_file (const char *key, const char *var, int no_floppy,
void grub_search_fs_uuid (const char *key, const char *var, int no_floppy); const char **hints, unsigned nhints);
void grub_search_label (const char *key, const char *var, int no_floppy); void grub_search_fs_uuid (const char *key, const char *var, int no_floppy,
const char **hints, unsigned nhints);
void grub_search_label (const char *key, const char *var, int no_floppy,
const char **hints, unsigned nhints);
#endif #endif