2008-08-21 13:18:07 +00:00
|
|
|
/*
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2010-01-09 22:02:00 +00:00
|
|
|
* Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
2008-08-21 13:18:07 +00:00
|
|
|
*
|
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
|
|
* 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
|
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <grub/loader.h>
|
2010-01-13 13:03:54 +00:00
|
|
|
#include <grub/memory.h>
|
2009-05-02 15:24:28 +00:00
|
|
|
#include <grub/normal.h>
|
2008-08-21 13:18:07 +00:00
|
|
|
#include <grub/file.h>
|
|
|
|
#include <grub/disk.h>
|
|
|
|
#include <grub/err.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/dl.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/term.h>
|
|
|
|
#include <grub/cpu/linux.h>
|
2009-03-18 10:21:28 +00:00
|
|
|
#include <grub/video.h>
|
2009-08-14 12:41:58 +00:00
|
|
|
#include <grub/video_fb.h>
|
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
|
|
|
#include <grub/command.h>
|
2010-01-11 13:59:01 +00:00
|
|
|
#include <grub/i386/relocator.h>
|
2010-01-08 Carles Pina i Estany <carles@pina.cat>
* loader/efi/appleloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/efi/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/efi/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/xnu.c: Include `<grub/i18n.h>'.
(grub_cpu_xnu_init): Gettextizze.
* loader/multiboot_loader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/powerpc/ieee1275/linux.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/sparc64/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_linux_load64): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/xnu.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* po/POTFILES: Add `loader/efi/appleloader.c',
`loader/efi/chainloader.c', `loader/i386/efi/linux.c',
`loader/i386/ieee1275/linux.c', `loader/i386/linux.c',
`loader/i386/pc/chainloader.c', `loader/i386/pc/linux.c',
`loader/i386/xnu.c', `loader/multiboot_loader.c',
`loader/powerpc/ieee1275/linux.c', `loader/sparc64/ieee1275/linux.c'
and `loader/xnu.c'.
2010-01-08 21:35:38 +00:00
|
|
|
#include <grub/i18n.h>
|
2011-01-07 16:09:39 +00:00
|
|
|
#include <grub/lib/cmdline.h>
|
2013-03-22 20:01:28 +00:00
|
|
|
#include <grub/linux.h>
|
2015-08-09 23:28:29 +00:00
|
|
|
#include <grub/tpm.h>
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2017-01-25 22:54:46 +00:00
|
|
|
#include <grub/verity-hash.h>
|
|
|
|
|
2011-04-11 21:01:51 +00:00
|
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
|
2010-09-15 09:39:53 +00:00
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
|
|
#include <grub/i386/pc/vesa_modes_table.h>
|
|
|
|
#endif
|
|
|
|
|
2010-01-13 13:03:54 +00:00
|
|
|
#ifdef GRUB_MACHINE_EFI
|
|
|
|
#include <grub/efi/efi.h>
|
|
|
|
#define HAS_VGA_TEXT 0
|
2010-10-01 14:24:43 +00:00
|
|
|
#define DEFAULT_VIDEO_MODE "auto"
|
2011-08-16 14:11:10 +00:00
|
|
|
#define ACCEPTS_PURE_TEXT 0
|
2010-01-13 16:26:47 +00:00
|
|
|
#elif defined (GRUB_MACHINE_IEEE1275)
|
|
|
|
#include <grub/ieee1275/ieee1275.h>
|
|
|
|
#define HAS_VGA_TEXT 0
|
|
|
|
#define DEFAULT_VIDEO_MODE "text"
|
2011-08-16 14:11:10 +00:00
|
|
|
#define ACCEPTS_PURE_TEXT 1
|
2010-01-13 13:03:54 +00:00
|
|
|
#else
|
|
|
|
#include <grub/i386/pc/vbe.h>
|
|
|
|
#include <grub/i386/pc/console.h>
|
|
|
|
#define HAS_VGA_TEXT 1
|
|
|
|
#define DEFAULT_VIDEO_MODE "text"
|
2011-08-16 14:11:10 +00:00
|
|
|
#define ACCEPTS_PURE_TEXT 1
|
2010-01-13 13:03:54 +00:00
|
|
|
#endif
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
static grub_dl_t my_mod;
|
|
|
|
|
|
|
|
static grub_size_t linux_mem_size;
|
|
|
|
static int loaded;
|
|
|
|
static void *prot_mode_mem;
|
2010-01-11 13:59:01 +00:00
|
|
|
static grub_addr_t prot_mode_target;
|
2008-08-21 13:18:07 +00:00
|
|
|
static void *initrd_mem;
|
2010-01-11 13:59:01 +00:00
|
|
|
static grub_addr_t initrd_mem_target;
|
2012-03-07 22:45:20 +00:00
|
|
|
static grub_size_t prot_init_space;
|
2010-01-11 13:59:01 +00:00
|
|
|
static struct grub_relocator *relocator = NULL;
|
2010-01-13 13:03:54 +00:00
|
|
|
static void *efi_mmap_buf;
|
2010-11-13 20:27:08 +00:00
|
|
|
static grub_size_t maximal_cmdline_size;
|
2012-05-30 12:56:53 +00:00
|
|
|
static struct linux_kernel_params linux_params;
|
|
|
|
static char *linux_cmdline;
|
2010-01-13 19:50:04 +00:00
|
|
|
#ifdef GRUB_MACHINE_EFI
|
|
|
|
static grub_efi_uintn_t efi_mmap_size;
|
|
|
|
#else
|
|
|
|
static const grub_size_t efi_mmap_size = 0;
|
|
|
|
#endif
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2010-01-11 13:59:01 +00:00
|
|
|
/* FIXME */
|
|
|
|
#if 0
|
2008-08-21 13:18:07 +00:00
|
|
|
struct idt_descriptor
|
|
|
|
{
|
|
|
|
grub_uint16_t limit;
|
|
|
|
void *base;
|
2013-12-15 13:14:30 +00:00
|
|
|
} GRUB_PACKED;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
static struct idt_descriptor idt_desc =
|
|
|
|
{
|
|
|
|
0,
|
|
|
|
0
|
|
|
|
};
|
2010-01-11 13:59:01 +00:00
|
|
|
#endif
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
static inline grub_size_t
|
|
|
|
page_align (grub_size_t size)
|
|
|
|
{
|
|
|
|
return (size + (1 << 12) - 1) & (~((1 << 12) - 1));
|
|
|
|
}
|
|
|
|
|
2010-01-13 13:03:54 +00:00
|
|
|
#ifdef GRUB_MACHINE_EFI
|
|
|
|
/* Find the optimal number of pages for the memory map. Is it better to
|
|
|
|
move this code to efi/mm.c? */
|
|
|
|
static grub_efi_uintn_t
|
|
|
|
find_efi_mmap_size (void)
|
|
|
|
{
|
|
|
|
static grub_efi_uintn_t mmap_size = 0;
|
|
|
|
|
|
|
|
if (mmap_size != 0)
|
|
|
|
return mmap_size;
|
|
|
|
|
|
|
|
mmap_size = (1 << 12);
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
grub_efi_memory_descriptor_t *mmap;
|
|
|
|
grub_efi_uintn_t desc_size;
|
2012-07-02 09:14:37 +00:00
|
|
|
grub_efi_uintn_t cur_mmap_size = mmap_size;
|
2010-01-13 13:03:54 +00:00
|
|
|
|
2012-07-02 09:14:37 +00:00
|
|
|
mmap = grub_malloc (cur_mmap_size);
|
2010-01-13 13:03:54 +00:00
|
|
|
if (! mmap)
|
|
|
|
return 0;
|
|
|
|
|
2012-07-02 09:14:37 +00:00
|
|
|
ret = grub_efi_get_memory_map (&cur_mmap_size, mmap, 0, &desc_size, 0);
|
2010-01-13 13:03:54 +00:00
|
|
|
grub_free (mmap);
|
|
|
|
|
|
|
|
if (ret < 0)
|
2011-11-11 21:35:09 +00:00
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_IO, "cannot get memory map");
|
|
|
|
return 0;
|
|
|
|
}
|
2010-01-13 13:03:54 +00:00
|
|
|
else if (ret > 0)
|
|
|
|
break;
|
|
|
|
|
2012-07-02 09:14:37 +00:00
|
|
|
if (mmap_size < cur_mmap_size)
|
|
|
|
mmap_size = cur_mmap_size;
|
2010-01-13 13:03:54 +00:00
|
|
|
mmap_size += (1 << 12);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Increase the size a bit for safety, because GRUB allocates more on
|
|
|
|
later, and EFI itself may allocate more. */
|
2012-06-27 20:55:09 +00:00
|
|
|
mmap_size += (3 << 12);
|
2010-01-13 13:03:54 +00:00
|
|
|
|
2011-03-09 17:38:31 +00:00
|
|
|
mmap_size = page_align (mmap_size);
|
|
|
|
return mmap_size;
|
2010-01-13 13:03:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2013-01-15 12:02:35 +00:00
|
|
|
/* Helper for find_mmap_size. */
|
|
|
|
static int
|
|
|
|
count_hook (grub_uint64_t addr __attribute__ ((unused)),
|
|
|
|
grub_uint64_t size __attribute__ ((unused)),
|
|
|
|
grub_memory_type_t type __attribute__ ((unused)), void *data)
|
|
|
|
{
|
|
|
|
grub_size_t *count = data;
|
|
|
|
|
|
|
|
(*count)++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Find the optimal number of pages for the memory map. */
|
|
|
|
static grub_size_t
|
|
|
|
find_mmap_size (void)
|
|
|
|
{
|
|
|
|
grub_size_t count = 0, mmap_size;
|
|
|
|
|
2013-01-15 12:02:35 +00:00
|
|
|
grub_mmap_iterate (count_hook, &count);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
mmap_size = count * sizeof (struct grub_e820_mmap);
|
|
|
|
|
|
|
|
/* Increase the size a bit for safety, because GRUB allocates more on
|
|
|
|
later. */
|
|
|
|
mmap_size += (1 << 12);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
return page_align (mmap_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_pages (void)
|
|
|
|
{
|
2010-01-11 13:59:01 +00:00
|
|
|
grub_relocator_unload (relocator);
|
|
|
|
relocator = NULL;
|
2012-05-30 12:56:53 +00:00
|
|
|
prot_mode_mem = initrd_mem = 0;
|
|
|
|
prot_mode_target = initrd_mem_target = 0;
|
2008-08-21 13:18:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate pages for the real mode code and the protected mode code
|
|
|
|
for linux as well as a memory map buffer. */
|
2010-01-11 13:59:01 +00:00
|
|
|
static grub_err_t
|
2012-03-03 19:06:41 +00:00
|
|
|
allocate_pages (grub_size_t prot_size, grub_size_t *align,
|
|
|
|
grub_size_t min_align, int relocatable,
|
2012-10-05 12:09:19 +00:00
|
|
|
grub_uint64_t preferred_address)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2010-01-11 13:59:01 +00:00
|
|
|
grub_err_t err;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2013-10-28 13:30:29 +00:00
|
|
|
if (prot_size == 0)
|
|
|
|
prot_size = 1;
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
prot_size = page_align (prot_size);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Initialize the memory pointers with NULL for convenience. */
|
2009-04-07 00:48:57 +00:00
|
|
|
free_pages ();
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-01-11 13:59:01 +00:00
|
|
|
relocator = grub_relocator_new ();
|
|
|
|
if (!relocator)
|
|
|
|
{
|
|
|
|
err = grub_errno;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2009-03-08 12:46:27 +00:00
|
|
|
/* FIXME: Should request low memory from the heap when this feature is
|
|
|
|
implemented. */
|
2008-11-14 20:18:07 +00:00
|
|
|
|
2010-04-21 17:13:45 +00:00
|
|
|
{
|
|
|
|
grub_relocator_chunk_t ch;
|
2012-03-03 19:06:41 +00:00
|
|
|
if (relocatable)
|
|
|
|
{
|
|
|
|
err = grub_relocator_alloc_chunk_align (relocator, &ch,
|
2012-10-05 12:09:19 +00:00
|
|
|
preferred_address,
|
|
|
|
preferred_address,
|
2012-03-03 19:06:41 +00:00
|
|
|
prot_size, 1,
|
|
|
|
GRUB_RELOCATOR_PREFERENCE_LOW,
|
|
|
|
1);
|
2012-03-05 00:35:58 +00:00
|
|
|
for (; err && *align + 1 > min_align; (*align)--)
|
2012-03-03 19:06:41 +00:00
|
|
|
{
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
err = grub_relocator_alloc_chunk_align (relocator, &ch,
|
2012-03-11 22:41:29 +00:00
|
|
|
0x1000000,
|
|
|
|
0xffffffff & ~prot_size,
|
2012-03-03 19:06:41 +00:00
|
|
|
prot_size, 1 << *align,
|
|
|
|
GRUB_RELOCATOR_PREFERENCE_LOW,
|
|
|
|
1);
|
|
|
|
}
|
|
|
|
if (err)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
|
2012-10-05 12:09:19 +00:00
|
|
|
preferred_address,
|
2012-03-03 19:06:41 +00:00
|
|
|
prot_size);
|
2010-04-21 17:13:45 +00:00
|
|
|
if (err)
|
|
|
|
goto fail;
|
|
|
|
prot_mode_mem = get_virtual_current_address (ch);
|
2012-03-03 19:06:41 +00:00
|
|
|
prot_mode_target = get_physical_target_address (ch);
|
2010-04-21 17:13:45 +00:00
|
|
|
}
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2013-12-15 13:35:18 +00:00
|
|
|
grub_dprintf ("linux", "prot_mode_mem = %p, prot_mode_target = %lx, prot_size = %x\n",
|
|
|
|
prot_mode_mem, (unsigned long) prot_mode_target,
|
2012-05-30 12:56:53 +00:00
|
|
|
(unsigned) prot_size);
|
2010-01-11 13:59:01 +00:00
|
|
|
return GRUB_ERR_NONE;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
fail:
|
|
|
|
free_pages ();
|
2010-01-11 13:59:01 +00:00
|
|
|
return err;
|
2008-08-21 13:18:07 +00:00
|
|
|
}
|
|
|
|
|
2011-11-11 21:35:09 +00:00
|
|
|
static grub_err_t
|
2008-08-21 13:18:07 +00:00
|
|
|
grub_e820_add_region (struct grub_e820_mmap *e820_map, int *e820_num,
|
|
|
|
grub_uint64_t start, grub_uint64_t size,
|
|
|
|
grub_uint32_t type)
|
|
|
|
{
|
|
|
|
int n = *e820_num;
|
|
|
|
|
|
|
|
if ((n > 0) && (e820_map[n - 1].addr + e820_map[n - 1].size == start) &&
|
|
|
|
(e820_map[n - 1].type == type))
|
|
|
|
e820_map[n - 1].size += size;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
e820_map[n].addr = start;
|
|
|
|
e820_map[n].size = size;
|
|
|
|
e820_map[n].type = type;
|
|
|
|
(*e820_num)++;
|
|
|
|
}
|
2011-11-11 21:35:09 +00:00
|
|
|
return GRUB_ERR_NONE;
|
2008-08-21 13:18:07 +00:00
|
|
|
}
|
|
|
|
|
2010-01-13 13:03:54 +00:00
|
|
|
static grub_err_t
|
2009-03-18 10:21:28 +00:00
|
|
|
grub_linux_setup_video (struct linux_kernel_params *params)
|
|
|
|
{
|
|
|
|
struct grub_video_mode_info mode_info;
|
2009-08-14 12:41:58 +00:00
|
|
|
void *framebuffer;
|
2010-01-13 13:03:54 +00:00
|
|
|
grub_err_t err;
|
2011-01-10 23:02:01 +00:00
|
|
|
grub_video_driver_id_t driver_id;
|
2011-11-11 19:34:37 +00:00
|
|
|
const char *gfxlfbvar = grub_env_get ("gfxpayloadforcelfb");
|
2011-01-10 23:02:01 +00:00
|
|
|
|
|
|
|
driver_id = grub_video_get_driver_id ();
|
|
|
|
|
|
|
|
if (driver_id == GRUB_VIDEO_DRIVER_NONE)
|
|
|
|
return 1;
|
2010-01-13 13:03:54 +00:00
|
|
|
|
|
|
|
err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
|
2009-03-18 10:21:28 +00:00
|
|
|
|
2010-01-13 13:03:54 +00:00
|
|
|
if (err)
|
2010-02-07 00:41:23 +00:00
|
|
|
{
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
return 1;
|
|
|
|
}
|
2009-03-18 10:21:28 +00:00
|
|
|
|
|
|
|
params->lfb_width = mode_info.width;
|
|
|
|
params->lfb_height = mode_info.height;
|
|
|
|
params->lfb_depth = mode_info.bpp;
|
|
|
|
params->lfb_line_len = mode_info.pitch;
|
|
|
|
|
2009-08-14 12:41:58 +00:00
|
|
|
params->lfb_base = (grub_size_t) framebuffer;
|
2010-02-10 19:27:12 +00:00
|
|
|
params->lfb_size = ALIGN_UP (params->lfb_line_len * params->lfb_height, 65536);
|
2009-03-18 10:21:28 +00:00
|
|
|
|
2009-04-03 20:03:39 +00:00
|
|
|
params->red_mask_size = mode_info.red_mask_size;
|
|
|
|
params->red_field_pos = mode_info.red_field_pos;
|
|
|
|
params->green_mask_size = mode_info.green_mask_size;
|
|
|
|
params->green_field_pos = mode_info.green_field_pos;
|
|
|
|
params->blue_mask_size = mode_info.blue_mask_size;
|
|
|
|
params->blue_field_pos = mode_info.blue_field_pos;
|
|
|
|
params->reserved_mask_size = mode_info.reserved_mask_size;
|
|
|
|
params->reserved_field_pos = mode_info.reserved_field_pos;
|
2009-03-18 10:21:28 +00:00
|
|
|
|
2011-01-10 23:02:01 +00:00
|
|
|
if (gfxlfbvar && (gfxlfbvar[0] == '1' || gfxlfbvar[0] == 'y'))
|
|
|
|
params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
switch (driver_id)
|
|
|
|
{
|
|
|
|
case GRUB_VIDEO_DRIVER_VBE:
|
|
|
|
params->lfb_size >>= 16;
|
|
|
|
params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GRUB_VIDEO_DRIVER_EFI_UGA:
|
|
|
|
case GRUB_VIDEO_DRIVER_EFI_GOP:
|
|
|
|
params->have_vga = GRUB_VIDEO_LINUX_TYPE_EFIFB;
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* FIXME: check if better id is available. */
|
|
|
|
case GRUB_VIDEO_DRIVER_SM712:
|
2011-05-15 10:32:37 +00:00
|
|
|
case GRUB_VIDEO_DRIVER_SIS315PRO:
|
2011-01-10 23:02:01 +00:00
|
|
|
case GRUB_VIDEO_DRIVER_VGA:
|
|
|
|
case GRUB_VIDEO_DRIVER_CIRRUS:
|
|
|
|
case GRUB_VIDEO_DRIVER_BOCHS:
|
2011-08-20 09:58:41 +00:00
|
|
|
case GRUB_VIDEO_DRIVER_RADEON_FULOONG2E:
|
2013-12-17 21:51:13 +00:00
|
|
|
case GRUB_VIDEO_DRIVER_RADEON_YEELOONG3A:
|
2013-04-24 12:44:15 +00:00
|
|
|
case GRUB_VIDEO_DRIVER_IEEE1275:
|
|
|
|
case GRUB_VIDEO_DRIVER_COREBOOT:
|
2011-01-10 23:02:01 +00:00
|
|
|
/* Make gcc happy. */
|
2013-12-17 12:07:26 +00:00
|
|
|
case GRUB_VIDEO_DRIVER_XEN:
|
2011-01-10 23:02:01 +00:00
|
|
|
case GRUB_VIDEO_DRIVER_SDL:
|
|
|
|
case GRUB_VIDEO_DRIVER_NONE:
|
2013-05-02 16:06:39 +00:00
|
|
|
case GRUB_VIDEO_ADAPTER_CAPTURE:
|
2011-01-10 23:02:01 +00:00
|
|
|
params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2009-09-12 13:07:27 +00:00
|
|
|
|
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
|
|
/* VESA packed modes may come with zeroed mask sizes, which need
|
|
|
|
to be set here according to DAC Palette width. If we don't,
|
|
|
|
this results in Linux displaying a black screen. */
|
2011-01-10 23:02:01 +00:00
|
|
|
if (driver_id == GRUB_VIDEO_DRIVER_VBE && mode_info.bpp <= 8)
|
2009-09-12 13:07:27 +00:00
|
|
|
{
|
|
|
|
struct grub_vbe_info_block controller_info;
|
|
|
|
int status;
|
|
|
|
int width = 8;
|
|
|
|
|
|
|
|
status = grub_vbe_bios_get_controller_info (&controller_info);
|
|
|
|
|
|
|
|
if (status == GRUB_VBE_STATUS_OK &&
|
|
|
|
(controller_info.capabilities & GRUB_VBE_CAPABILITY_DACWIDTH))
|
|
|
|
status = grub_vbe_bios_set_dac_palette_width (&width);
|
|
|
|
|
|
|
|
if (status != GRUB_VBE_STATUS_OK)
|
|
|
|
/* 6 is default after mode reset. */
|
|
|
|
width = 6;
|
|
|
|
|
|
|
|
params->red_mask_size = params->green_mask_size
|
|
|
|
= params->blue_mask_size = width;
|
|
|
|
params->reserved_mask_size = 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-01-13 13:03:54 +00:00
|
|
|
return GRUB_ERR_NONE;
|
2009-03-18 10:21:28 +00:00
|
|
|
}
|
|
|
|
|
2013-01-15 12:02:35 +00:00
|
|
|
/* Context for grub_linux_boot. */
|
|
|
|
struct grub_linux_boot_ctx
|
|
|
|
{
|
|
|
|
grub_addr_t real_mode_target;
|
|
|
|
grub_size_t real_size;
|
|
|
|
struct linux_kernel_params *params;
|
|
|
|
int e820_num;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Helper for grub_linux_boot. */
|
|
|
|
static int
|
|
|
|
grub_linux_boot_mmap_find (grub_uint64_t addr, grub_uint64_t size,
|
|
|
|
grub_memory_type_t type, void *data)
|
|
|
|
{
|
|
|
|
struct grub_linux_boot_ctx *ctx = data;
|
|
|
|
|
|
|
|
/* We must put real mode code in the traditional space. */
|
|
|
|
if (type != GRUB_MEMORY_AVAILABLE || addr > 0x90000)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (addr + size < 0x10000)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (addr < 0x10000)
|
|
|
|
{
|
|
|
|
size += addr - 0x10000;
|
|
|
|
addr = 0x10000;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (addr + size > 0x90000)
|
|
|
|
size = 0x90000 - addr;
|
|
|
|
|
|
|
|
if (ctx->real_size + efi_mmap_size > size)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
grub_dprintf ("linux", "addr = %lx, size = %x, need_size = %x\n",
|
|
|
|
(unsigned long) addr,
|
|
|
|
(unsigned) size,
|
|
|
|
(unsigned) (ctx->real_size + efi_mmap_size));
|
|
|
|
ctx->real_mode_target = ((addr + size) - (ctx->real_size + efi_mmap_size));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2013-10-14 14:33:44 +00:00
|
|
|
/* GRUB types conveniently match E820 types. */
|
2013-01-15 12:02:35 +00:00
|
|
|
static int
|
|
|
|
grub_linux_boot_mmap_fill (grub_uint64_t addr, grub_uint64_t size,
|
|
|
|
grub_memory_type_t type, void *data)
|
|
|
|
{
|
|
|
|
struct grub_linux_boot_ctx *ctx = data;
|
|
|
|
|
|
|
|
if (grub_e820_add_region (ctx->params->e820_map, &ctx->e820_num,
|
2013-10-14 14:33:44 +00:00
|
|
|
addr, size, type))
|
2013-01-15 12:02:35 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
static grub_err_t
|
2009-03-28 12:53:16 +00:00
|
|
|
grub_linux_boot (void)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2009-06-27 17:37:07 +00:00
|
|
|
grub_err_t err = 0;
|
2011-11-11 19:34:37 +00:00
|
|
|
const char *modevar;
|
|
|
|
char *tmp;
|
2010-01-11 13:59:01 +00:00
|
|
|
struct grub_relocator32_state state;
|
2012-05-30 12:56:53 +00:00
|
|
|
void *real_mode_mem;
|
2013-01-15 12:02:35 +00:00
|
|
|
struct grub_linux_boot_ctx ctx = {
|
|
|
|
.real_mode_target = 0
|
|
|
|
};
|
|
|
|
grub_size_t mmap_size;
|
2012-05-30 12:56:53 +00:00
|
|
|
grub_size_t cl_offset;
|
|
|
|
|
2012-06-20 21:39:33 +00:00
|
|
|
#ifdef GRUB_MACHINE_IEEE1275
|
|
|
|
{
|
|
|
|
const char *bootpath;
|
|
|
|
grub_ssize_t len;
|
|
|
|
|
|
|
|
bootpath = grub_env_get ("root");
|
|
|
|
if (bootpath)
|
|
|
|
grub_ieee1275_set_property (grub_ieee1275_chosen,
|
|
|
|
"bootpath", bootpath,
|
|
|
|
grub_strlen (bootpath) + 1,
|
|
|
|
&len);
|
|
|
|
linux_params.ofw_signature = GRUB_LINUX_OFW_SIGNATURE;
|
|
|
|
linux_params.ofw_num_items = 1;
|
|
|
|
linux_params.ofw_cif_handler = (grub_uint32_t) grub_ieee1275_entry_fn;
|
|
|
|
linux_params.ofw_idt = 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
modevar = grub_env_get ("gfxpayload");
|
|
|
|
|
|
|
|
/* Now all graphical modes are acceptable.
|
|
|
|
May change in future if we have modes without framebuffer. */
|
|
|
|
if (modevar && *modevar != 0)
|
|
|
|
{
|
|
|
|
tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
|
|
|
|
if (! tmp)
|
|
|
|
return grub_errno;
|
|
|
|
#if ACCEPTS_PURE_TEXT
|
|
|
|
err = grub_video_set_mode (tmp, 0, 0);
|
|
|
|
#else
|
|
|
|
err = grub_video_set_mode (tmp, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
|
|
|
|
#endif
|
|
|
|
grub_free (tmp);
|
|
|
|
}
|
2013-04-24 12:53:00 +00:00
|
|
|
else /* We can't go back to text mode from coreboot fb. */
|
|
|
|
#ifdef GRUB_MACHINE_COREBOOT
|
|
|
|
if (grub_video_get_driver_id () == GRUB_VIDEO_DRIVER_COREBOOT)
|
|
|
|
err = GRUB_ERR_NONE;
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
2012-06-20 21:39:33 +00:00
|
|
|
#if ACCEPTS_PURE_TEXT
|
2013-04-24 12:53:00 +00:00
|
|
|
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0, 0);
|
2012-06-20 21:39:33 +00:00
|
|
|
#else
|
2013-04-24 12:53:00 +00:00
|
|
|
err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
|
2012-06-20 21:39:33 +00:00
|
|
|
GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
|
|
|
|
#endif
|
2013-04-24 12:53:00 +00:00
|
|
|
}
|
2012-06-20 21:39:33 +00:00
|
|
|
|
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
grub_print_error ();
|
|
|
|
grub_puts_ (N_("Booting in blind mode"));
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (grub_linux_setup_video (&linux_params))
|
|
|
|
{
|
|
|
|
#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
|
|
|
|
linux_params.have_vga = GRUB_VIDEO_LINUX_TYPE_TEXT;
|
|
|
|
linux_params.video_mode = 0x3;
|
|
|
|
#else
|
|
|
|
linux_params.have_vga = 0;
|
|
|
|
linux_params.video_mode = 0;
|
|
|
|
linux_params.video_width = 0;
|
|
|
|
linux_params.video_height = 0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_MACHINE_IEEE1275
|
|
|
|
if (linux_params.have_vga == GRUB_VIDEO_LINUX_TYPE_TEXT)
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
grub_term_output_t term;
|
|
|
|
int found = 0;
|
|
|
|
FOR_ACTIVE_TERM_OUTPUTS(term)
|
|
|
|
if (grub_strcmp (term->name, "vga_text") == 0
|
|
|
|
|| grub_strcmp (term->name, "console") == 0
|
|
|
|
|| grub_strcmp (term->name, "ofconsole") == 0)
|
|
|
|
{
|
2013-10-19 21:59:32 +00:00
|
|
|
struct grub_term_coordinate pos = grub_term_getxy (term);
|
|
|
|
linux_params.video_cursor_x = pos.x;
|
|
|
|
linux_params.video_cursor_y = pos.y;
|
2012-06-20 21:39:33 +00:00
|
|
|
linux_params.video_width = grub_term_width (term);
|
|
|
|
linux_params.video_height = grub_term_height (term);
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!found)
|
|
|
|
{
|
|
|
|
linux_params.video_cursor_x = 0;
|
|
|
|
linux_params.video_cursor_y = 0;
|
|
|
|
linux_params.video_width = 80;
|
|
|
|
linux_params.video_height = 25;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-30 12:56:53 +00:00
|
|
|
mmap_size = find_mmap_size ();
|
|
|
|
/* Make sure that each size is aligned to a page boundary. */
|
2012-06-20 21:39:33 +00:00
|
|
|
cl_offset = ALIGN_UP (mmap_size + sizeof (linux_params), 4096);
|
|
|
|
if (cl_offset < ((grub_size_t) linux_params.setup_sects << GRUB_DISK_SECTOR_BITS))
|
|
|
|
cl_offset = ALIGN_UP ((grub_size_t) (linux_params.setup_sects
|
2012-05-31 10:04:55 +00:00
|
|
|
<< GRUB_DISK_SECTOR_BITS), 4096);
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.real_size = ALIGN_UP (cl_offset + maximal_cmdline_size, 4096);
|
2012-05-30 12:56:53 +00:00
|
|
|
|
|
|
|
#ifdef GRUB_MACHINE_EFI
|
|
|
|
efi_mmap_size = find_efi_mmap_size ();
|
|
|
|
if (efi_mmap_size == 0)
|
|
|
|
return grub_errno;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
grub_dprintf ("linux", "real_size = %x, mmap_size = %x\n",
|
2013-01-15 12:02:35 +00:00
|
|
|
(unsigned) ctx.real_size, (unsigned) mmap_size);
|
2012-05-30 12:56:53 +00:00
|
|
|
|
|
|
|
#ifdef GRUB_MACHINE_EFI
|
2013-01-15 12:02:35 +00:00
|
|
|
grub_efi_mmap_iterate (grub_linux_boot_mmap_find, &ctx, 1);
|
|
|
|
if (! ctx.real_mode_target)
|
|
|
|
grub_efi_mmap_iterate (grub_linux_boot_mmap_find, &ctx, 0);
|
2012-05-30 12:56:53 +00:00
|
|
|
#else
|
2013-01-15 12:02:35 +00:00
|
|
|
grub_mmap_iterate (grub_linux_boot_mmap_find, &ctx);
|
2012-05-30 12:56:53 +00:00
|
|
|
#endif
|
2012-05-31 10:04:55 +00:00
|
|
|
grub_dprintf ("linux", "real_mode_target = %lx, real_size = %x, efi_mmap_size = %x\n",
|
2013-01-15 12:02:35 +00:00
|
|
|
(unsigned long) ctx.real_mode_target,
|
|
|
|
(unsigned) ctx.real_size,
|
2012-05-31 10:04:55 +00:00
|
|
|
(unsigned) efi_mmap_size);
|
|
|
|
|
2013-01-15 12:02:35 +00:00
|
|
|
if (! ctx.real_mode_target)
|
2012-05-30 12:56:53 +00:00
|
|
|
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate real mode pages");
|
|
|
|
|
|
|
|
{
|
|
|
|
grub_relocator_chunk_t ch;
|
|
|
|
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.real_mode_target,
|
|
|
|
(ctx.real_size + efi_mmap_size));
|
2012-05-30 12:56:53 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
real_mode_mem = get_virtual_current_address (ch);
|
|
|
|
}
|
2013-01-15 12:02:35 +00:00
|
|
|
efi_mmap_buf = (grub_uint8_t *) real_mode_mem + ctx.real_size;
|
2012-05-30 12:56:53 +00:00
|
|
|
|
2013-12-15 13:35:18 +00:00
|
|
|
grub_dprintf ("linux", "real_mode_mem = %p\n",
|
|
|
|
real_mode_mem);
|
2012-06-20 21:39:33 +00:00
|
|
|
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.params = real_mode_mem;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2013-01-15 12:02:35 +00:00
|
|
|
*ctx.params = linux_params;
|
|
|
|
ctx.params->cmd_line_ptr = ctx.real_mode_target + cl_offset;
|
|
|
|
grub_memcpy ((char *) ctx.params + cl_offset, linux_cmdline,
|
2012-05-30 12:56:53 +00:00
|
|
|
maximal_cmdline_size);
|
|
|
|
|
2010-01-11 13:59:01 +00:00
|
|
|
grub_dprintf ("linux", "code32_start = %x\n",
|
2013-01-15 12:02:35 +00:00
|
|
|
(unsigned) ctx.params->code32_start);
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.e820_num = 0;
|
|
|
|
if (grub_mmap_iterate (grub_linux_boot_mmap_fill, &ctx))
|
2011-11-11 21:35:09 +00:00
|
|
|
return grub_errno;
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.params->mmap_size = ctx.e820_num;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2010-01-13 13:03:54 +00:00
|
|
|
#ifdef GRUB_MACHINE_EFI
|
|
|
|
{
|
2010-04-20 16:08:26 +00:00
|
|
|
grub_efi_uintn_t efi_desc_size;
|
2011-04-25 14:58:25 +00:00
|
|
|
grub_size_t efi_mmap_target;
|
2010-01-13 13:03:54 +00:00
|
|
|
grub_efi_uint32_t efi_desc_version;
|
2010-04-20 16:08:26 +00:00
|
|
|
err = grub_efi_finish_boot_services (&efi_mmap_size, efi_mmap_buf, NULL,
|
|
|
|
&efi_desc_size, &efi_desc_version);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2010-01-13 13:03:54 +00:00
|
|
|
|
|
|
|
/* Note that no boot services are available from here. */
|
2013-01-15 12:02:35 +00:00
|
|
|
efi_mmap_target = ctx.real_mode_target
|
2011-04-25 14:58:25 +00:00
|
|
|
+ ((grub_uint8_t *) efi_mmap_buf - (grub_uint8_t *) real_mode_mem);
|
2010-01-13 13:03:54 +00:00
|
|
|
/* Pass EFI parameters. */
|
2013-01-15 12:02:35 +00:00
|
|
|
if (grub_le_to_cpu16 (ctx.params->version) >= 0x0208)
|
2012-05-31 11:23:30 +00:00
|
|
|
{
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.params->v0208.efi_mem_desc_size = efi_desc_size;
|
|
|
|
ctx.params->v0208.efi_mem_desc_version = efi_desc_version;
|
|
|
|
ctx.params->v0208.efi_mmap = efi_mmap_target;
|
|
|
|
ctx.params->v0208.efi_mmap_size = efi_mmap_size;
|
2012-05-31 11:23:30 +00:00
|
|
|
|
|
|
|
#ifdef __x86_64__
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.params->v0208.efi_mmap_hi = (efi_mmap_target >> 32);
|
2012-05-31 11:23:30 +00:00
|
|
|
#endif
|
|
|
|
}
|
2013-01-15 12:02:35 +00:00
|
|
|
else if (grub_le_to_cpu16 (ctx.params->version) >= 0x0206)
|
2010-01-13 13:03:54 +00:00
|
|
|
{
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.params->v0206.efi_mem_desc_size = efi_desc_size;
|
|
|
|
ctx.params->v0206.efi_mem_desc_version = efi_desc_version;
|
|
|
|
ctx.params->v0206.efi_mmap = efi_mmap_target;
|
|
|
|
ctx.params->v0206.efi_mmap_size = efi_mmap_size;
|
2010-01-13 13:03:54 +00:00
|
|
|
}
|
2013-01-15 12:02:35 +00:00
|
|
|
else if (grub_le_to_cpu16 (ctx.params->version) >= 0x0204)
|
2010-01-13 13:03:54 +00:00
|
|
|
{
|
2013-01-15 12:02:35 +00:00
|
|
|
ctx.params->v0204.efi_mem_desc_size = efi_desc_size;
|
|
|
|
ctx.params->v0204.efi_mem_desc_version = efi_desc_version;
|
|
|
|
ctx.params->v0204.efi_mmap = efi_mmap_target;
|
|
|
|
ctx.params->v0204.efi_mmap_size = efi_mmap_size;
|
2010-01-13 13:03:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-01-11 13:59:01 +00:00
|
|
|
/* FIXME. */
|
|
|
|
/* asm volatile ("lidt %0" : : "m" (idt_desc)); */
|
2010-09-02 21:36:09 +00:00
|
|
|
state.ebp = state.edi = state.ebx = 0;
|
2013-01-15 12:02:35 +00:00
|
|
|
state.esi = ctx.real_mode_target;
|
|
|
|
state.esp = ctx.real_mode_target;
|
|
|
|
state.eip = ctx.params->code32_start;
|
2012-03-03 19:06:41 +00:00
|
|
|
return grub_relocator32_boot (relocator, state, 0);
|
2008-08-21 13:18:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
grub_linux_unload (void)
|
|
|
|
{
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
loaded = 0;
|
2012-05-30 12:56:53 +00:00
|
|
|
grub_free (linux_cmdline);
|
|
|
|
linux_cmdline = 0;
|
2008-08-21 13:18:07 +00:00
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
static grub_err_t
|
|
|
|
grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
int argc, char *argv[])
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
|
|
|
grub_file_t file = 0;
|
2018-02-01 18:18:52 +00:00
|
|
|
struct linux_i386_kernel_header lh;
|
2008-08-21 13:18:07 +00:00
|
|
|
grub_uint8_t setup_sects;
|
2015-08-09 23:12:39 +00:00
|
|
|
grub_size_t real_size, prot_size, prot_file_size, kernel_offset;
|
2008-08-21 13:18:07 +00:00
|
|
|
grub_ssize_t len;
|
|
|
|
int i;
|
2012-03-03 19:06:41 +00:00
|
|
|
grub_size_t align, min_align;
|
|
|
|
int relocatable;
|
2012-10-05 12:09:19 +00:00
|
|
|
grub_uint64_t preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
|
2015-08-09 23:12:39 +00:00
|
|
|
grub_uint8_t *kernel = NULL;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
grub_dl_ref (my_mod);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (argc == 0)
|
|
|
|
{
|
2012-02-08 18:26:01 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
file = grub_file_open (argv[0]);
|
|
|
|
if (! file)
|
2009-06-27 12:21:18 +00:00
|
|
|
goto fail;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2015-08-09 23:12:39 +00:00
|
|
|
len = grub_file_size (file);
|
|
|
|
kernel = grub_malloc (len);
|
|
|
|
if (!kernel)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel buffer"));
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (grub_file_read (file, kernel, len) != len)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2011-12-26 11:58:08 +00:00
|
|
|
if (!grub_errno)
|
2012-02-08 18:26:01 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
2011-12-26 11:58:08 +00:00
|
|
|
argv[0]);
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2016-03-24 00:03:43 +00:00
|
|
|
grub_tpm_measure (kernel, len, GRUB_BINARY_PCR, "grub_linux", "Kernel");
|
2016-10-13 20:55:26 +00:00
|
|
|
grub_print_error();
|
2015-08-09 23:28:29 +00:00
|
|
|
|
2015-08-09 23:12:39 +00:00
|
|
|
grub_memcpy (&lh, kernel, sizeof (lh));
|
2015-08-09 23:28:29 +00:00
|
|
|
|
2015-08-09 23:12:39 +00:00
|
|
|
kernel_offset = sizeof (lh);
|
|
|
|
|
2013-12-17 13:39:48 +00:00
|
|
|
if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_BAD_OS, "too many setup sectors");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2012-04-11 20:40:20 +00:00
|
|
|
/* FIXME: 2.03 is not always good enough (Linux 2.4 can be 2.03 and
|
|
|
|
still not support 32-bit boot. */
|
2018-02-01 18:18:51 +00:00
|
|
|
if (lh.header != grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE)
|
2012-04-11 20:40:20 +00:00
|
|
|
|| grub_le_to_cpu16 (lh.version) < 0x0203)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2012-04-11 20:40:20 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_OS, "version too old for 32-bit boot"
|
2009-03-30 22:22:31 +00:00
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
|
|
" (try with `linux16')"
|
|
|
|
#endif
|
|
|
|
);
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2012-04-11 20:40:20 +00:00
|
|
|
if (! (lh.loadflags & GRUB_LINUX_FLAG_BIG_KERNEL))
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2012-04-11 20:40:20 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_OS, "zImage doesn't support 32-bit boot"
|
2009-03-30 22:22:31 +00:00
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
|
|
" (try with `linux16')"
|
|
|
|
#endif
|
|
|
|
);
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2010-11-13 20:27:08 +00:00
|
|
|
if (grub_le_to_cpu16 (lh.version) >= 0x0206)
|
|
|
|
maximal_cmdline_size = grub_le_to_cpu32 (lh.cmdline_size) + 1;
|
|
|
|
else
|
|
|
|
maximal_cmdline_size = 256;
|
|
|
|
|
|
|
|
if (maximal_cmdline_size < 128)
|
|
|
|
maximal_cmdline_size = 128;
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
setup_sects = lh.setup_sects;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* If SETUP_SECTS is not set, set it to the default (4). */
|
|
|
|
if (! setup_sects)
|
|
|
|
setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS;
|
|
|
|
|
|
|
|
real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
|
2012-03-04 11:13:05 +00:00
|
|
|
prot_file_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2012-03-03 19:06:41 +00:00
|
|
|
if (grub_le_to_cpu16 (lh.version) >= 0x205
|
|
|
|
&& lh.kernel_alignment != 0
|
|
|
|
&& ((lh.kernel_alignment - 1) & lh.kernel_alignment) == 0)
|
|
|
|
{
|
|
|
|
for (align = 0; align < 32; align++)
|
|
|
|
if (grub_le_to_cpu32 (lh.kernel_alignment) & (1 << align))
|
|
|
|
break;
|
|
|
|
relocatable = grub_le_to_cpu32 (lh.relocatable);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
align = 0;
|
|
|
|
relocatable = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (grub_le_to_cpu16 (lh.version) >= 0x020a)
|
|
|
|
{
|
|
|
|
min_align = lh.min_alignment;
|
|
|
|
prot_size = grub_le_to_cpu32 (lh.init_size);
|
2012-03-07 22:45:20 +00:00
|
|
|
prot_init_space = page_align (prot_size);
|
2012-03-11 22:41:29 +00:00
|
|
|
if (relocatable)
|
2012-10-05 12:09:19 +00:00
|
|
|
preferred_address = grub_le_to_cpu64 (lh.pref_address);
|
2012-03-11 22:41:29 +00:00
|
|
|
else
|
2012-10-05 12:09:19 +00:00
|
|
|
preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
|
2012-03-03 19:06:41 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2012-03-07 22:45:20 +00:00
|
|
|
min_align = align;
|
2012-03-04 11:13:05 +00:00
|
|
|
prot_size = prot_file_size;
|
2012-10-05 12:09:19 +00:00
|
|
|
preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
|
2012-03-07 22:45:20 +00:00
|
|
|
/* Usually, the compression ratio is about 50%. */
|
|
|
|
prot_init_space = page_align (prot_size) * 3;
|
2012-03-03 19:06:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (allocate_pages (prot_size, &align,
|
|
|
|
min_align, relocatable,
|
2012-10-05 12:09:19 +00:00
|
|
|
preferred_address))
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2013-04-14 17:01:23 +00:00
|
|
|
grub_memset (&linux_params, 0, sizeof (linux_params));
|
|
|
|
grub_memcpy (&linux_params.setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1);
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.code32_start = prot_mode_target + lh.code32_start - GRUB_LINUX_BZIMAGE_ADDR;
|
|
|
|
linux_params.kernel_alignment = (1 << align);
|
|
|
|
linux_params.ps_mouse = linux_params.padding10 = 0;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2013-04-14 17:01:23 +00:00
|
|
|
len = sizeof (linux_params) - sizeof (lh);
|
2015-08-09 23:12:39 +00:00
|
|
|
|
2018-04-09 12:07:21 +00:00
|
|
|
grub_memcpy ((char *) &linux_params + sizeof (lh), kernel + kernel_offset, len);
|
2015-08-09 23:12:39 +00:00
|
|
|
kernel_offset += len;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2009-06-29 17:19:35 +00:00
|
|
|
/* These two are used (instead of cmd_line_ptr) by older versions of Linux,
|
|
|
|
and otherwise ignored. */
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.cl_magic = GRUB_LINUX_CL_MAGIC;
|
|
|
|
linux_params.cl_offset = 0x1000;
|
2009-06-29 17:19:35 +00:00
|
|
|
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.ramdisk_image = 0;
|
|
|
|
linux_params.ramdisk_size = 0;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.heap_end_ptr = GRUB_LINUX_HEAP_END_OFFSET;
|
|
|
|
linux_params.loadflags |= GRUB_LINUX_FLAG_CAN_USE_HEAP;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
/* These are not needed to be precise, because Linux uses these values
|
|
|
|
only to raise an error when the decompression code cannot find good
|
|
|
|
space. */
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.ext_mem = ((32 * 0x100000) >> 10);
|
|
|
|
linux_params.alt_mem = ((32 * 0x100000) >> 10);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2009-06-29 17:19:35 +00:00
|
|
|
/* Ignored by Linux. */
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.video_page = 0;
|
2009-06-29 17:19:35 +00:00
|
|
|
|
|
|
|
/* Only used when `video_mode == 0x7', otherwise ignored. */
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.video_ega_bx = 0;
|
2009-06-29 17:19:35 +00:00
|
|
|
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.font_size = 16; /* XXX */
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2010-01-13 13:03:54 +00:00
|
|
|
#ifdef GRUB_MACHINE_EFI
|
2012-05-31 11:23:30 +00:00
|
|
|
#ifdef __x86_64__
|
2013-04-14 17:01:23 +00:00
|
|
|
if (grub_le_to_cpu16 (linux_params.version) < 0x0208 &&
|
2012-05-31 11:23:30 +00:00
|
|
|
((grub_addr_t) grub_efi_system_table >> 32) != 0)
|
|
|
|
return grub_error(GRUB_ERR_BAD_OS,
|
|
|
|
"kernel does not support 64-bit addressing");
|
|
|
|
#endif
|
|
|
|
|
2013-04-14 17:01:23 +00:00
|
|
|
if (grub_le_to_cpu16 (linux_params.version) >= 0x0208)
|
2010-01-13 13:03:54 +00:00
|
|
|
{
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.v0208.efi_signature = GRUB_LINUX_EFI_SIGNATURE;
|
2013-12-15 13:37:12 +00:00
|
|
|
linux_params.v0208.efi_system_table = (grub_uint32_t) (grub_addr_t) grub_efi_system_table;
|
2010-01-13 13:03:54 +00:00
|
|
|
#ifdef __x86_64__
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.v0208.efi_system_table_hi = (grub_uint32_t) ((grub_uint64_t) grub_efi_system_table >> 32);
|
2010-01-13 13:03:54 +00:00
|
|
|
#endif
|
|
|
|
}
|
2013-04-14 17:01:23 +00:00
|
|
|
else if (grub_le_to_cpu16 (linux_params.version) >= 0x0206)
|
2012-05-31 11:23:30 +00:00
|
|
|
{
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.v0206.efi_signature = GRUB_LINUX_EFI_SIGNATURE;
|
2013-12-15 13:37:12 +00:00
|
|
|
linux_params.v0206.efi_system_table = (grub_uint32_t) (grub_addr_t) grub_efi_system_table;
|
2012-05-31 11:23:30 +00:00
|
|
|
}
|
2013-04-14 17:01:23 +00:00
|
|
|
else if (grub_le_to_cpu16 (linux_params.version) >= 0x0204)
|
2010-01-13 13:03:54 +00:00
|
|
|
{
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.v0204.efi_signature = GRUB_LINUX_EFI_SIGNATURE_0204;
|
2013-12-15 13:37:12 +00:00
|
|
|
linux_params.v0204.efi_system_table = (grub_uint32_t) (grub_addr_t) grub_efi_system_table;
|
2010-01-13 13:03:54 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* The other parameters are filled when booting. */
|
|
|
|
|
2015-08-09 23:12:39 +00:00
|
|
|
kernel_offset = real_size + GRUB_DISK_SECTOR_SIZE;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2010-01-09 22:02:00 +00:00
|
|
|
grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
|
|
|
|
(unsigned) real_size, (unsigned) prot_size);
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2009-04-07 00:48:57 +00:00
|
|
|
/* Look for memory size and video mode specified on the command line. */
|
2008-08-21 13:18:07 +00:00
|
|
|
linux_mem_size = 0;
|
|
|
|
for (i = 1; i < argc; i++)
|
2009-05-04 18:40:33 +00:00
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
2009-03-29 19:52:35 +00:00
|
|
|
if (grub_memcmp (argv[i], "vga=", 4) == 0)
|
|
|
|
{
|
|
|
|
/* Video mode selection support. */
|
|
|
|
char *val = argv[i] + 4;
|
2009-06-04 18:22:45 +00:00
|
|
|
unsigned vid_mode = GRUB_LINUX_VID_MODE_NORMAL;
|
2010-09-15 09:39:53 +00:00
|
|
|
struct grub_vesa_mode_table_entry *linux_mode;
|
2009-06-04 18:22:45 +00:00
|
|
|
grub_err_t err;
|
|
|
|
char *buf;
|
2009-03-29 19:52:35 +00:00
|
|
|
|
2010-11-01 12:10:51 +00:00
|
|
|
grub_dl_load ("vbe");
|
|
|
|
|
2009-03-29 19:52:35 +00:00
|
|
|
if (grub_strcmp (val, "normal") == 0)
|
|
|
|
vid_mode = GRUB_LINUX_VID_MODE_NORMAL;
|
|
|
|
else if (grub_strcmp (val, "ext") == 0)
|
|
|
|
vid_mode = GRUB_LINUX_VID_MODE_EXTENDED;
|
2009-04-07 00:48:57 +00:00
|
|
|
else if (grub_strcmp (val, "ask") == 0)
|
2009-04-13 14:38:10 +00:00
|
|
|
{
|
2011-11-11 23:34:14 +00:00
|
|
|
grub_puts_ (N_("Legacy `ask' parameter no longer supported."));
|
2009-05-02 15:24:28 +00:00
|
|
|
|
|
|
|
/* We usually would never do this in a loader, but "vga=ask" means user
|
|
|
|
requested interaction, so it can't hurt to request keyboard input. */
|
|
|
|
grub_wait_after_message ();
|
|
|
|
|
2009-04-13 14:38:10 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2009-03-29 19:52:35 +00:00
|
|
|
else
|
|
|
|
vid_mode = (grub_uint16_t) grub_strtoul (val, 0, 0);
|
|
|
|
|
2009-05-04 18:04:09 +00:00
|
|
|
switch (vid_mode)
|
|
|
|
{
|
|
|
|
case 0:
|
2009-06-04 18:22:45 +00:00
|
|
|
case GRUB_LINUX_VID_MODE_NORMAL:
|
|
|
|
grub_env_set ("gfxpayload", "text");
|
2011-11-11 23:34:14 +00:00
|
|
|
grub_printf_ (N_("%s is deprecated. "
|
2012-02-26 16:28:05 +00:00
|
|
|
"Use set gfxpayload=%s before "
|
2017-01-08 12:52:49 +00:00
|
|
|
"linux command instead.\n"),
|
|
|
|
argv[i], "text");
|
2009-05-04 18:04:09 +00:00
|
|
|
break;
|
2009-06-04 18:22:45 +00:00
|
|
|
|
2009-05-04 18:04:09 +00:00
|
|
|
case 1:
|
2009-06-04 18:22:45 +00:00
|
|
|
case GRUB_LINUX_VID_MODE_EXTENDED:
|
|
|
|
/* FIXME: support 80x50 text. */
|
|
|
|
grub_env_set ("gfxpayload", "text");
|
2011-11-11 23:34:14 +00:00
|
|
|
grub_printf_ (N_("%s is deprecated. "
|
2012-02-26 16:28:05 +00:00
|
|
|
"Use set gfxpayload=%s before "
|
2017-01-08 12:52:49 +00:00
|
|
|
"linux command instead.\n"),
|
|
|
|
argv[i], "text");
|
2009-05-04 18:04:09 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Ignore invalid values. */
|
2010-09-15 09:39:53 +00:00
|
|
|
if (vid_mode < GRUB_VESA_MODE_TABLE_START ||
|
|
|
|
vid_mode > GRUB_VESA_MODE_TABLE_END)
|
2009-06-04 18:22:45 +00:00
|
|
|
{
|
|
|
|
grub_env_set ("gfxpayload", "text");
|
2012-03-06 14:04:33 +00:00
|
|
|
/* TRANSLATORS: "x" has to be entered in, like an identifier,
|
|
|
|
so please don't use better Unicode codepoints. */
|
2012-03-02 10:53:50 +00:00
|
|
|
grub_printf_ (N_("%s is deprecated. VGA mode %d isn't recognized. "
|
2011-11-11 23:34:14 +00:00
|
|
|
"Use set gfxpayload=WIDTHxHEIGHT[xDEPTH] "
|
|
|
|
"before linux command instead.\n"),
|
2009-06-10 21:04:23 +00:00
|
|
|
argv[i], vid_mode);
|
2009-06-04 18:22:45 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-09-15 09:39:53 +00:00
|
|
|
linux_mode = &grub_vesa_mode_table[vid_mode
|
|
|
|
- GRUB_VESA_MODE_TABLE_START];
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-01-20 08:12:47 +00:00
|
|
|
buf = grub_xasprintf ("%ux%ux%u,%ux%u",
|
2010-09-15 09:39:53 +00:00
|
|
|
linux_mode->width, linux_mode->height,
|
2009-12-29 09:04:06 +00:00
|
|
|
linux_mode->depth,
|
2010-09-15 09:39:53 +00:00
|
|
|
linux_mode->width, linux_mode->height);
|
2009-12-29 09:04:06 +00:00
|
|
|
if (! buf)
|
|
|
|
goto fail;
|
|
|
|
|
2011-11-11 23:34:14 +00:00
|
|
|
grub_printf_ (N_("%s is deprecated. "
|
|
|
|
"Use set gfxpayload=%s before "
|
|
|
|
"linux command instead.\n"),
|
2009-06-10 21:04:23 +00:00
|
|
|
argv[i], buf);
|
2009-06-04 18:22:45 +00:00
|
|
|
err = grub_env_set ("gfxpayload", buf);
|
|
|
|
grub_free (buf);
|
|
|
|
if (err)
|
|
|
|
goto fail;
|
2009-05-04 18:04:09 +00:00
|
|
|
}
|
2009-03-29 19:52:35 +00:00
|
|
|
}
|
2009-05-04 18:59:12 +00:00
|
|
|
else
|
2009-05-04 18:40:33 +00:00
|
|
|
#endif /* GRUB_MACHINE_PCBIOS */
|
2009-05-04 18:59:12 +00:00
|
|
|
if (grub_memcmp (argv[i], "mem=", 4) == 0)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
|
|
|
char *val = argv[i] + 4;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
linux_mem_size = grub_strtoul (val, &val, 0);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (grub_errno)
|
|
|
|
{
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
linux_mem_size = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int shift = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
switch (grub_tolower (val[0]))
|
|
|
|
{
|
|
|
|
case 'g':
|
|
|
|
shift += 10;
|
2017-04-04 16:23:55 +00:00
|
|
|
/* FALLTHROUGH */
|
2008-08-21 13:18:07 +00:00
|
|
|
case 'm':
|
|
|
|
shift += 10;
|
2017-04-04 16:23:55 +00:00
|
|
|
/* FALLTHROUGH */
|
2008-08-21 13:18:07 +00:00
|
|
|
case 'k':
|
|
|
|
shift += 10;
|
2017-04-04 16:23:55 +00:00
|
|
|
/* FALLTHROUGH */
|
2008-08-21 13:18:07 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check an overflow. */
|
|
|
|
if (linux_mem_size > (~0UL >> shift))
|
|
|
|
linux_mem_size = 0;
|
|
|
|
else
|
|
|
|
linux_mem_size <<= shift;
|
|
|
|
}
|
|
|
|
}
|
2009-06-29 12:20:56 +00:00
|
|
|
else if (grub_memcmp (argv[i], "quiet", sizeof ("quiet") - 1) == 0)
|
|
|
|
{
|
2013-04-14 17:01:23 +00:00
|
|
|
linux_params.loadflags |= GRUB_LINUX_FLAG_QUIET;
|
2009-06-29 12:20:56 +00:00
|
|
|
}
|
|
|
|
|
2011-01-07 16:09:39 +00:00
|
|
|
/* Create kernel command line. */
|
2012-05-30 12:56:53 +00:00
|
|
|
linux_cmdline = grub_zalloc (maximal_cmdline_size + 1);
|
|
|
|
if (!linux_cmdline)
|
|
|
|
goto fail;
|
|
|
|
grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
|
2011-01-07 16:09:39 +00:00
|
|
|
grub_create_loader_cmdline (argc, argv,
|
2012-05-30 12:56:53 +00:00
|
|
|
linux_cmdline
|
2011-01-07 16:09:39 +00:00
|
|
|
+ sizeof (LINUX_IMAGE) - 1,
|
2011-05-18 07:56:33 +00:00
|
|
|
maximal_cmdline_size
|
2011-01-07 16:09:39 +00:00
|
|
|
- (sizeof (LINUX_IMAGE) - 1));
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2016-10-19 21:12:55 +00:00
|
|
|
grub_pass_verity_hash(&lh, linux_cmdline, maximal_cmdline_size);
|
2012-03-04 11:13:05 +00:00
|
|
|
len = prot_file_size;
|
2015-08-09 23:12:39 +00:00
|
|
|
grub_memcpy (prot_mode_mem, kernel + kernel_offset, len);
|
2015-08-09 23:28:29 +00:00
|
|
|
kernel_offset += len;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
if (grub_errno == GRUB_ERR_NONE)
|
|
|
|
{
|
2009-03-28 12:53:16 +00:00
|
|
|
grub_loader_set (grub_linux_boot, grub_linux_unload,
|
2009-03-18 10:21:28 +00:00
|
|
|
0 /* set noreturn=0 in order to avoid grub_console_fini() */);
|
2008-08-21 13:18:07 +00:00
|
|
|
loaded = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2015-08-09 23:12:39 +00:00
|
|
|
grub_free (kernel);
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (file)
|
|
|
|
grub_file_close (file);
|
|
|
|
|
|
|
|
if (grub_errno != GRUB_ERR_NONE)
|
|
|
|
{
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
loaded = 0;
|
|
|
|
}
|
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
|
|
|
|
|
|
|
return grub_errno;
|
2008-08-21 13:18:07 +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
|
|
|
static grub_err_t
|
|
|
|
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
int argc, char *argv[])
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2015-05-07 14:23:39 +00:00
|
|
|
grub_size_t size = 0, aligned_size = 0;
|
2008-08-21 13:18:07 +00:00
|
|
|
grub_addr_t addr_min, addr_max;
|
|
|
|
grub_addr_t addr;
|
2010-01-11 13:59:01 +00:00
|
|
|
grub_err_t err;
|
2014-10-14 16:12:15 +00:00
|
|
|
struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (argc == 0)
|
|
|
|
{
|
2012-02-08 18:26:01 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (! loaded)
|
|
|
|
{
|
2012-02-08 18:26:01 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, N_("you need to load the kernel first"));
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2013-03-22 20:01:28 +00:00
|
|
|
if (grub_initrd_init (argc, argv, &initrd_ctx))
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
|
2013-03-22 20:01:28 +00:00
|
|
|
size = grub_get_initrd_size (&initrd_ctx);
|
2015-05-07 14:23:39 +00:00
|
|
|
aligned_size = ALIGN_UP (size, 4096);
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2008-11-19 12:11:44 +00:00
|
|
|
/* Get the highest address available for the initrd. */
|
2012-06-25 15:44:36 +00:00
|
|
|
if (grub_le_to_cpu16 (linux_params.version) >= 0x0203)
|
2008-11-19 12:11:44 +00:00
|
|
|
{
|
2012-06-25 15:44:36 +00:00
|
|
|
addr_max = grub_cpu_to_le32 (linux_params.initrd_addr_max);
|
2008-11-19 12:11:44 +00:00
|
|
|
|
|
|
|
/* XXX in reality, Linux specifies a bogus value, so
|
|
|
|
it is necessary to make sure that ADDR_MAX does not exceed
|
|
|
|
0x3fffffff. */
|
|
|
|
if (addr_max > GRUB_LINUX_INITRD_MAX_ADDRESS)
|
|
|
|
addr_max = GRUB_LINUX_INITRD_MAX_ADDRESS;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
addr_max = GRUB_LINUX_INITRD_MAX_ADDRESS;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (linux_mem_size != 0 && linux_mem_size < addr_max)
|
|
|
|
addr_max = linux_mem_size;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Linux 2.3.xx has a bug in the memory range check, so avoid
|
|
|
|
the last page.
|
|
|
|
Linux 2.2.xx has a bug in the memory range check, which is
|
|
|
|
worse than that of Linux 2.3.xx, so avoid the last 64kb. */
|
|
|
|
addr_max -= 0x10000;
|
|
|
|
|
2013-01-20 23:03:35 +00:00
|
|
|
addr_min = (grub_addr_t) prot_mode_target + prot_init_space;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-11-19 12:11:44 +00:00
|
|
|
/* Put the initrd as high as possible, 4KiB aligned. */
|
2015-05-07 14:23:39 +00:00
|
|
|
addr = (addr_max - aligned_size) & ~0xFFF;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2008-11-19 12:11:44 +00:00
|
|
|
if (addr < addr_min)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2009-12-24 22:53:05 +00:00
|
|
|
grub_error (GRUB_ERR_OUT_OF_RANGE, "the initrd is too big");
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-04-21 17:13:45 +00:00
|
|
|
{
|
|
|
|
grub_relocator_chunk_t ch;
|
|
|
|
err = grub_relocator_alloc_chunk_align (relocator, &ch,
|
2015-05-07 14:23:39 +00:00
|
|
|
addr_min, addr, aligned_size,
|
|
|
|
0x1000,
|
2012-03-03 19:06:41 +00:00
|
|
|
GRUB_RELOCATOR_PREFERENCE_HIGH,
|
|
|
|
1);
|
2010-04-21 17:13:45 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
initrd_mem = get_virtual_current_address (ch);
|
|
|
|
initrd_mem_target = get_physical_target_address (ch);
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2013-03-22 20:01:28 +00:00
|
|
|
if (grub_initrd_load (&initrd_ctx, argv, initrd_mem))
|
|
|
|
goto fail;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2010-01-09 22:02:00 +00:00
|
|
|
grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
|
|
|
|
(unsigned) addr, (unsigned) size);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2012-06-25 15:44:36 +00:00
|
|
|
linux_params.ramdisk_image = initrd_mem_target;
|
|
|
|
linux_params.ramdisk_size = size;
|
|
|
|
linux_params.root_dev = 0x0100; /* XXX */
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
fail:
|
2013-03-22 20:01:28 +00:00
|
|
|
grub_initrd_close (&initrd_ctx);
|
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
|
|
|
|
|
|
|
return grub_errno;
|
2008-08-21 13:18:07 +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
|
|
|
static grub_command_t cmd_linux, cmd_initrd;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
GRUB_MOD_INIT(linux)
|
|
|
|
{
|
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_linux = grub_register_command ("linux", grub_cmd_linux,
|
2010-01-08 Carles Pina i Estany <carles@pina.cat>
* loader/efi/appleloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/efi/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/efi/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/xnu.c: Include `<grub/i18n.h>'.
(grub_cpu_xnu_init): Gettextizze.
* loader/multiboot_loader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/powerpc/ieee1275/linux.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/sparc64/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_linux_load64): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/xnu.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* po/POTFILES: Add `loader/efi/appleloader.c',
`loader/efi/chainloader.c', `loader/i386/efi/linux.c',
`loader/i386/ieee1275/linux.c', `loader/i386/linux.c',
`loader/i386/pc/chainloader.c', `loader/i386/pc/linux.c',
`loader/i386/xnu.c', `loader/multiboot_loader.c',
`loader/powerpc/ieee1275/linux.c', `loader/sparc64/ieee1275/linux.c'
and `loader/xnu.c'.
2010-01-08 21:35:38 +00:00
|
|
|
0, N_("Load Linux."));
|
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_initrd = grub_register_command ("initrd", grub_cmd_initrd,
|
2010-01-08 Carles Pina i Estany <carles@pina.cat>
* loader/efi/appleloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/efi/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/efi/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/chainloader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/pc/linux.c: Include `<grub/i18n.h>'.
(grub_cmd_linux): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/i386/xnu.c: Include `<grub/i18n.h>'.
(grub_cpu_xnu_init): Gettextizze.
* loader/multiboot_loader.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/powerpc/ieee1275/linux.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* loader/sparc64/ieee1275/linux.c: Include `<grub/i18n.h>'.
(grub_linux_load64): Capitalise Linux.
(GRUB_MOD_INIT): Gettextizze.
* loader/xnu.c: Include `<grub/i18n.h>'.
(GRUB_MOD_INIT): Gettextizze.
* po/POTFILES: Add `loader/efi/appleloader.c',
`loader/efi/chainloader.c', `loader/i386/efi/linux.c',
`loader/i386/ieee1275/linux.c', `loader/i386/linux.c',
`loader/i386/pc/chainloader.c', `loader/i386/pc/linux.c',
`loader/i386/xnu.c', `loader/multiboot_loader.c',
`loader/powerpc/ieee1275/linux.c', `loader/sparc64/ieee1275/linux.c'
and `loader/xnu.c'.
2010-01-08 21:35:38 +00:00
|
|
|
0, N_("Load initrd."));
|
2008-08-21 13:18:07 +00:00
|
|
|
my_mod = mod;
|
|
|
|
}
|
|
|
|
|
|
|
|
GRUB_MOD_FINI(linux)
|
|
|
|
{
|
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
|
|
|
grub_unregister_command (cmd_linux);
|
|
|
|
grub_unregister_command (cmd_initrd);
|
2008-08-21 13:18:07 +00:00
|
|
|
}
|