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

Adjust loader for new command interface.

Browse source
This commit is contained in:
Robert Millan 2010-01-18 17:36:16 +00:00
parent c5565c5292
commit 4e9fe6a294
2 changed files with 32 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
loader/ia64/efi/linux.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2008 Free Software Foundation, Inc. * Copyright (C) 2008,2010 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@
#include <grub/err.h> #include <grub/err.h>
#include <grub/misc.h> #include <grub/misc.h>
#include <grub/types.h> #include <grub/types.h>
#include <grub/rescue.h> #include <grub/command.h>
#include <grub/dl.h> #include <grub/dl.h>
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/cache.h> #include <grub/cache.h>
@ -756,26 +756,39 @@ grub_rescue_cmd_fpswa (int argc, char *argv[] __attribute__((unused)))
GRUB_MOD_INIT(linux) GRUB_MOD_INIT(linux)
{ {
grub_rescue_register_command ("linux", grub_register_extcmd ("linux", grub_normal_linux_command,
grub_rescue_cmd_linux, GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"load linux"); "linux FILE [ARGS...]",
grub_rescue_register_command ("initrd", "Load Linux.", 0);
grub_rescue_cmd_initrd,
"load initrd"); grub_register_extcmd ("initrd", grub_normal_initrd_command,
grub_rescue_register_command ("payload", grub_rescue_cmd_payload, GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"load an additional file"); "initrd FILE",
grub_rescue_register_command ("relocate", grub_rescue_cmd_relocate, "Load initrd.", 0);
"set relocate feature");
grub_rescue_register_command ("fpswa", grub_rescue_cmd_fpswa, grub_register_extcmd ("payload", grub_normal_cmd_payload,
"load fpswa"); GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"payload FILE [ARGS...]",
"Load an additional file.", 0);
grub_register_extcmd ("relocate", grub_normal_cmd_relocate,
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"relocate [on|off|force]",
"Set relocate feature.", 0);
grub_register_extcmd ("fpswa", grub_normal_cmd_fpswa,
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"fpswa",
"Display FPSWA version.", 0);
my_mod = mod; my_mod = mod;
} }
GRUB_MOD_FINI(linux) GRUB_MOD_FINI(linux)
{ {
grub_rescue_unregister_command ("linux"); grub_unregister_command ("linux");
grub_rescue_unregister_command ("initrd"); grub_unregister_command ("initrd");
grub_rescue_unregister_command ("payload"); grub_unregister_command ("payload");
grub_rescue_unregister_command ("relocate"); grub_unregister_command ("relocate");
grub_rescue_unregister_command ("fpswa"); grub_unregister_command ("fpswa");
} }

107
loader/ia64/efi/linux_normal.c
View file

@ -1,107 +0,0 @@
/* linux_normal.c - boot linux */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2008 Free Software Foundation, Inc.
*
* 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/machine/loader.h>
#include <grub/err.h>
#include <grub/normal.h>
#include <grub/dl.h>
static grub_err_t
grub_normal_linux_command (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_rescue_cmd_linux (argc, args);
return grub_errno;
}
static grub_err_t
grub_normal_initrd_command (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_rescue_cmd_initrd (argc, args);
return grub_errno;
}
static grub_err_t
grub_normal_cmd_payload (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_rescue_cmd_payload (argc, args);
return grub_errno;
}
static grub_err_t
grub_normal_cmd_relocate (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_rescue_cmd_relocate (argc, args);
return grub_errno;
}
static grub_err_t
grub_normal_cmd_fpswa (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_rescue_cmd_fpswa (argc, args);
return grub_errno;
}
GRUB_MOD_INIT(linux_normal)
{
(void) mod; /* To stop warning. */
grub_register_command
("linux", grub_normal_linux_command,
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"linux FILE [ARGS...]",
"Load a linux kernel.", 0);
grub_register_command
("initrd", grub_normal_initrd_command,
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"initrd FILE",
"Load an initrd.", 0);
grub_register_command
("payload", grub_normal_cmd_payload,
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"payload FILE [ARGS...]",
"Load an additional file.", 0);
grub_register_command
("relocate", grub_normal_cmd_relocate,
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"relocate [on|off|force]",
"Set relocate feature.", 0);
grub_register_command
("fpswa", grub_normal_cmd_fpswa,
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
"fpswa",
"Display FPSWA version.", 0);
}
GRUB_MOD_FINI(linux_normal)
{
grub_unregister_command ("linux");
grub_unregister_command ("initrd");
grub_unregister_command ("payload");
grub_unregister_command ("relocate");
grub_unregister_command ("fpswa");
}