2005-08-20 07:49:02 +00:00
|
|
|
/* search.c - search devices based on a file or a filesystem label */
|
|
|
|
/*
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2009-06-04 11:18:18 +00:00
|
|
|
* Copyright (C) 2005,2007,2008,2009 Free Software Foundation, Inc.
|
2005-08-20 07:49:02 +00:00
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2005-08-20 07:49:02 +00:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2005-08-20 07:49:02 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2005-08-20 07:49:02 +00:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-21 23:32:33 +00:00
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2005-08-20 07:49:02 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/err.h>
|
|
|
|
#include <grub/dl.h>
|
|
|
|
#include <grub/device.h>
|
|
|
|
#include <grub/file.h>
|
|
|
|
#include <grub/env.h>
|
2009-11-22 12:15:49 +00:00
|
|
|
#include <grub/command.h>
|
2009-11-23 20:15:44 +00:00
|
|
|
#include <grub/search.h>
|
2009-12-25 20:51:05 +00:00
|
|
|
#include <grub/i18n.h>
|
2010-09-13 10:16:22 +00:00
|
|
|
#include <grub/disk.h>
|
|
|
|
#include <grub/partition.h>
|
2005-08-20 07:49:02 +00:00
|
|
|
|
2009-09-22 07:27:59 +00:00
|
|
|
void
|
2009-12-28 13:02:23 +00:00
|
|
|
FUNC_NAME (const char *key, const char *var, int no_floppy,
|
2010-09-13 10:16:22 +00:00
|
|
|
char **hints, unsigned nhints)
|
2005-08-20 07:49:02 +00:00
|
|
|
{
|
|
|
|
int count = 0;
|
2009-08-23 15:27:07 +00:00
|
|
|
grub_fs_autoload_hook_t saved_autoload;
|
2008-05-30 11:04:08 +00:00
|
|
|
|
2005-08-20 07:49:02 +00:00
|
|
|
auto int iterate_device (const char *name);
|
|
|
|
int iterate_device (const char *name)
|
2009-07-07 20:13:39 +00:00
|
|
|
{
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
/* Skip floppy drives when requested. */
|
|
|
|
if (no_floppy &&
|
|
|
|
name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
|
|
|
|
return 0;
|
|
|
|
|
2009-09-22 07:27:59 +00:00
|
|
|
#ifdef DO_SEARCH_FILE
|
2009-07-07 20:13:39 +00:00
|
|
|
{
|
2009-12-29 09:04:06 +00:00
|
|
|
char *buf;
|
2009-07-07 20:13:39 +00:00
|
|
|
grub_file_t file;
|
|
|
|
|
2010-01-20 08:12:47 +00:00
|
|
|
buf = grub_xasprintf ("(%s)%s", name, key);
|
2009-12-29 09:04:06 +00:00
|
|
|
if (! buf)
|
2009-07-07 20:13:39 +00:00
|
|
|
return 1;
|
|
|
|
|
2010-09-05 11:05:36 +00:00
|
|
|
grub_file_filter_disable_compression ();
|
2009-07-07 20:13:39 +00:00
|
|
|
file = grub_file_open (buf);
|
|
|
|
if (file)
|
|
|
|
{
|
|
|
|
found = 1;
|
|
|
|
grub_file_close (file);
|
|
|
|
}
|
2009-12-29 09:04:06 +00:00
|
|
|
grub_free (buf);
|
2009-07-07 20:13:39 +00:00
|
|
|
}
|
2009-09-22 07:27:59 +00:00
|
|
|
#else
|
2009-07-07 20:13:39 +00:00
|
|
|
{
|
2009-09-22 07:27:59 +00:00
|
|
|
/* SEARCH_FS_UUID or SEARCH_LABEL */
|
2009-07-07 20:13:39 +00:00
|
|
|
grub_device_t dev;
|
|
|
|
grub_fs_t fs;
|
|
|
|
char *quid;
|
|
|
|
|
|
|
|
dev = grub_device_open (name);
|
|
|
|
if (dev)
|
|
|
|
{
|
|
|
|
fs = grub_fs_probe (dev);
|
|
|
|
|
2009-09-22 07:27:59 +00:00
|
|
|
#ifdef DO_SEARCH_FS_UUID
|
|
|
|
#define compare_fn grub_strcasecmp
|
|
|
|
#define read_fn uuid
|
|
|
|
#else
|
|
|
|
#define compare_fn grub_strcmp
|
|
|
|
#define read_fn label
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (fs && fs->read_fn)
|
2009-07-07 20:13:39 +00:00
|
|
|
{
|
2009-09-22 07:27:59 +00:00
|
|
|
fs->read_fn (dev, &quid);
|
2009-07-07 20:13:39 +00:00
|
|
|
|
|
|
|
if (grub_errno == GRUB_ERR_NONE && quid)
|
|
|
|
{
|
|
|
|
if (compare_fn (quid, key) == 0)
|
|
|
|
found = 1;
|
|
|
|
|
|
|
|
grub_free (quid);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_device_close (dev);
|
|
|
|
}
|
|
|
|
}
|
2009-09-22 07:27:59 +00:00
|
|
|
#endif
|
2009-07-07 20:13:39 +00:00
|
|
|
|
|
|
|
if (found)
|
|
|
|
{
|
|
|
|
count++;
|
|
|
|
if (var)
|
|
|
|
grub_env_set (var, name);
|
|
|
|
else
|
|
|
|
grub_printf (" %s", name);
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
return (found && var);
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-09-13 10:16:22 +00:00
|
|
|
auto int part_hook (grub_disk_t disk, const grub_partition_t partition);
|
|
|
|
int part_hook (grub_disk_t disk, const grub_partition_t partition)
|
|
|
|
{
|
|
|
|
char *partition_name, *devname;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
partition_name = grub_partition_get_name (partition);
|
|
|
|
if (! partition_name)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
devname = grub_xasprintf ("%s,%s", disk->name, partition_name);
|
|
|
|
grub_free (partition_name);
|
|
|
|
if (!devname)
|
|
|
|
return 1;
|
|
|
|
ret = iterate_device (devname);
|
|
|
|
grub_free (devname);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-12-28 13:02:23 +00:00
|
|
|
auto void try (void);
|
|
|
|
void try (void)
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
for (i = 0; i < nhints; i++)
|
2010-09-13 10:16:22 +00:00
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
if (!hints[i][0])
|
|
|
|
continue;
|
|
|
|
end = hints[i] + grub_strlen (hints[i]) - 1;
|
|
|
|
if (*end == ',')
|
|
|
|
*end = 0;
|
|
|
|
if (iterate_device (hints[i]))
|
|
|
|
{
|
|
|
|
if (!*end)
|
|
|
|
*end = ',';
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!*end)
|
|
|
|
{
|
|
|
|
grub_device_t dev;
|
|
|
|
int ret;
|
|
|
|
dev = grub_device_open (hints[i]);
|
|
|
|
if (!dev)
|
|
|
|
{
|
|
|
|
*end = ',';
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!dev->disk)
|
|
|
|
{
|
|
|
|
grub_device_close (dev);
|
|
|
|
*end = ',';
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ret = grub_partition_iterate (dev->disk, part_hook);
|
|
|
|
*end = ',';
|
|
|
|
grub_device_close (dev);
|
|
|
|
if (ret)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2009-12-28 13:02:23 +00:00
|
|
|
grub_device_iterate (iterate_device);
|
|
|
|
}
|
|
|
|
|
2009-08-23 15:27:07 +00:00
|
|
|
/* First try without autoloading if we're setting variable. */
|
|
|
|
if (var)
|
|
|
|
{
|
|
|
|
saved_autoload = grub_fs_autoload_hook;
|
|
|
|
grub_fs_autoload_hook = 0;
|
2009-12-28 13:02:23 +00:00
|
|
|
try ();
|
2009-08-23 15:27:07 +00:00
|
|
|
|
|
|
|
/* Restore autoload hook. */
|
|
|
|
grub_fs_autoload_hook = saved_autoload;
|
|
|
|
|
|
|
|
/* Retry with autoload if nothing found. */
|
|
|
|
if (grub_errno == GRUB_ERR_NONE && count == 0)
|
2009-12-28 13:02:23 +00:00
|
|
|
try ();
|
2009-08-23 15:27:07 +00:00
|
|
|
}
|
|
|
|
else
|
2009-12-28 13:02:23 +00:00
|
|
|
try ();
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2005-08-20 07:49:02 +00:00
|
|
|
if (grub_errno == GRUB_ERR_NONE && count == 0)
|
2009-07-07 20:13:39 +00:00
|
|
|
grub_error (GRUB_ERR_FILE_NOT_FOUND, "no such device: %s", key);
|
2005-08-20 07:49:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
2009-09-22 07:27:59 +00:00
|
|
|
grub_cmd_do_search (grub_command_t cmd __attribute__ ((unused)), int argc,
|
|
|
|
char **args)
|
2005-08-20 07:49:02 +00:00
|
|
|
{
|
|
|
|
if (argc == 0)
|
2009-09-22 07:27:59 +00:00
|
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no argument specified");
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-09-13 10:16:22 +00:00
|
|
|
FUNC_NAME (args[0], argc == 1 ? 0 : args[1], 0, (args + 2),
|
2009-12-28 13:02:23 +00:00
|
|
|
argc > 2 ? argc - 2 : 0);
|
2005-08-20 07:49:02 +00:00
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
}
|
|
|
|
|
2009-09-22 07:27:59 +00:00
|
|
|
static grub_command_t cmd;
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
|
2009-11-23 20:15:44 +00:00
|
|
|
#ifdef DO_SEARCH_FILE
|
2010-02-07 02:06:33 +00:00
|
|
|
GRUB_MOD_INIT(search_fs_file)
|
2009-11-23 20:15:44 +00:00
|
|
|
#elif defined (DO_SEARCH_FS_UUID)
|
2009-09-22 07:27:59 +00:00
|
|
|
GRUB_MOD_INIT(search_fs_uuid)
|
|
|
|
#else
|
2010-02-07 02:06:33 +00:00
|
|
|
GRUB_MOD_INIT(search_label)
|
2009-09-22 07:27:59 +00:00
|
|
|
#endif
|
2005-08-20 07:49:02 +00:00
|
|
|
{
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
cmd =
|
2009-09-22 07:27:59 +00:00
|
|
|
grub_register_command (COMMAND_NAME, grub_cmd_do_search,
|
2010-09-13 00:22:10 +00:00
|
|
|
N_("NAME [VARIABLE] [HINTS]"),
|
2010-01-06 21:36:34 +00:00
|
|
|
HELP_MESSAGE);
|
2005-08-20 07:49:02 +00:00
|
|
|
}
|
|
|
|
|
2009-11-23 20:15:44 +00:00
|
|
|
#ifdef DO_SEARCH_FILE
|
2010-02-07 02:06:33 +00:00
|
|
|
GRUB_MOD_FINI(search_fs_file)
|
2009-11-23 20:15:44 +00:00
|
|
|
#elif defined (DO_SEARCH_FS_UUID)
|
2009-09-22 07:27:59 +00:00
|
|
|
GRUB_MOD_FINI(search_fs_uuid)
|
|
|
|
#else
|
2010-02-07 02:06:33 +00:00
|
|
|
GRUB_MOD_FINI(search_label)
|
2009-09-22 07:27:59 +00:00
|
|
|
#endif
|
2005-08-20 07:49:02 +00:00
|
|
|
{
|
2009-09-22 07:27:59 +00:00
|
|
|
grub_unregister_command (cmd);
|
2005-08-20 07:49:02 +00:00
|
|
|
}
|