From: Vladimir 'phcoder' Serbinenko Date: Mon, 13 Sep 2010 00:22:10 +0000 (+0200) Subject: merge mainline into hints X-Git-Tag: 1.99~534^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a848c54e341e554cc60fb59df56bdaa6a3a8a8e9;p=thirdparty%2Fgrub.git merge mainline into hints --- a848c54e341e554cc60fb59df56bdaa6a3a8a8e9 diff --cc grub-core/commands/handler.c index 09b8ff5d0,000000000..09b8ff5d0 mode 100644,000000..100644 --- a/grub-core/commands/handler.c +++ b/grub-core/commands/handler.c diff --cc grub-core/commands/search.c index c3626d352,8a646b452..9b693e76f --- a/grub-core/commands/search.c +++ b/grub-core/commands/search.c @@@ -30,11 -30,9 +30,10 @@@ #include 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; - char *buf = NULL; grub_fs_autoload_hook_t saved_autoload; auto int iterate_device (const char *name); @@@ -141,13 -126,11 +137,11 @@@ /* Retry with autoload if nothing found. */ if (grub_errno == GRUB_ERR_NONE && count == 0) - grub_device_iterate (iterate_device); + try (); } else - grub_device_iterate (iterate_device); + try (); - grub_free (buf); - if (grub_errno == GRUB_ERR_NONE && count == 0) grub_error (GRUB_ERR_FILE_NOT_FOUND, "no such device: %s", key); } @@@ -177,10 -159,8 +171,8 @@@ GRUB_MOD_INIT(search_label { cmd = grub_register_command (COMMAND_NAME, grub_cmd_do_search, - "NAME [VARIABLE] [HINTS]", - "Search devices by " SEARCH_TARGET "." - " If VARIABLE is specified, " - "the first device found is set to a variable."); - N_("NAME [VARIABLE]"), ++ N_("NAME [VARIABLE] [HINTS]"), + HELP_MESSAGE); } #ifdef DO_SEARCH_FILE diff --cc grub-core/efiemu/runtime/efiemu.sh index 5a492dc2f,000000000..5a492dc2f mode 100644,000000..100644 --- a/grub-core/efiemu/runtime/efiemu.sh +++ b/grub-core/efiemu/runtime/efiemu.sh diff --cc grub-core/kern/handler.c index 2bf85313c,000000000..2bf85313c mode 100644,000000..100644 --- a/grub-core/kern/handler.c +++ b/grub-core/kern/handler.c diff --cc grub-core/kern/i386/ieee1275/init.c index 7658ee1a7,000000000..7658ee1a7 mode 100644,000000..100644 --- a/grub-core/kern/i386/ieee1275/init.c +++ b/grub-core/kern/i386/ieee1275/init.c diff --cc grub-core/kern/i386/loader.S index 3e9c71327,000000000..3e9c71327 mode 100644,000000..100644 --- a/grub-core/kern/i386/loader.S +++ b/grub-core/kern/i386/loader.S diff --cc grub-core/kern/i386/misc.S index 7d57df9b9,000000000..7d57df9b9 mode 100644,000000..100644 --- a/grub-core/kern/i386/misc.S +++ b/grub-core/kern/i386/misc.S diff --cc grub-core/kern/reader.c index 271a90f5a,000000000..271a90f5a mode 100644,000000..100644 --- a/grub-core/kern/reader.c +++ b/grub-core/kern/reader.c diff --cc grub-core/loader/i386/bsd_helper.S index 25aee3a80,000000000..25aee3a80 mode 100644,000000..100644 --- a/grub-core/loader/i386/bsd_helper.S +++ b/grub-core/loader/i386/bsd_helper.S diff --cc grub-core/loader/i386/bsd_trampoline.S index a568fff4d,000000000..a568fff4d mode 100644,000000..100644 --- a/grub-core/loader/i386/bsd_trampoline.S +++ b/grub-core/loader/i386/bsd_trampoline.S diff --cc grub-core/loader/i386/efi/linux.c index 1c256e377,000000000..1c256e377 mode 100644,000000..100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c diff --cc grub-core/loader/i386/efi/xnu.c index a7ede1960,000000000..a7ede1960 mode 100644,000000..100644 --- a/grub-core/loader/i386/efi/xnu.c +++ b/grub-core/loader/i386/efi/xnu.c diff --cc grub-core/loader/i386/ieee1275/linux.c index b577de964,000000000..b577de964 mode 100644,000000..100644 --- a/grub-core/loader/i386/ieee1275/linux.c +++ b/grub-core/loader/i386/ieee1275/linux.c diff --cc grub-core/loader/i386/linux_trampoline.S index 4acea7b11,000000000..4acea7b11 mode 100644,000000..100644 --- a/grub-core/loader/i386/linux_trampoline.S +++ b/grub-core/loader/i386/linux_trampoline.S diff --cc grub-core/loader/i386/multiboot_helper.S index 2f9af778b,000000000..2f9af778b mode 100644,000000..100644 --- a/grub-core/loader/i386/multiboot_helper.S +++ b/grub-core/loader/i386/multiboot_helper.S diff --cc grub-core/loader/i386/pc/multiboot2.c index 9bfe5d248,000000000..9bfe5d248 mode 100644,000000..100644 --- a/grub-core/loader/i386/pc/multiboot2.c +++ b/grub-core/loader/i386/pc/multiboot2.c diff --cc grub-core/loader/i386/pc/xnu.c index ebb176bb4,000000000..ebb176bb4 mode 100644,000000..100644 --- a/grub-core/loader/i386/pc/xnu.c +++ b/grub-core/loader/i386/pc/xnu.c diff --cc grub-core/loader/ieee1275/multiboot2.c index 8c0bc09ec,000000000..8c0bc09ec mode 100644,000000..100644 --- a/grub-core/loader/ieee1275/multiboot2.c +++ b/grub-core/loader/ieee1275/multiboot2.c diff --cc grub-core/loader/multiboot2.c index dbdee9c87,000000000..dbdee9c87 mode 100644,000000..100644 --- a/grub-core/loader/multiboot2.c +++ b/grub-core/loader/multiboot2.c diff --cc grub-core/loader/multiboot_loader.c index 24c0c5eac,000000000..24c0c5eac mode 100644,000000..100644 --- a/grub-core/loader/multiboot_loader.c +++ b/grub-core/loader/multiboot_loader.c diff --cc grub-core/normal/handler.c index b44dc7a68,000000000..b44dc7a68 mode 100644,000000..100644 --- a/grub-core/normal/handler.c +++ b/grub-core/normal/handler.c diff --cc grub-core/normal/menu_viewer.c index f870ccd53,000000000..f870ccd53 mode 100644,000000..100644 --- a/grub-core/normal/menu_viewer.c +++ b/grub-core/normal/menu_viewer.c diff --cc grub-core/term/i386/pc/vesafb.c index 52694ed10,000000000..52694ed10 mode 100644,000000..100644 --- a/grub-core/term/i386/pc/vesafb.c +++ b/grub-core/term/i386/pc/vesafb.c