b47efe305a
Add `linux.mod' and `multiboot.mod' so linux and multiboot kernels can be loaded from normal mode. * conf/i386-pc.rmk (pkgdata_MODULES): Add `linux.mod' and `multiboot.mod'. (linux_mod_SOURCES, linux_mod_CFLAGS, multiboot_mod_SOURCES) (multiboot_mod_CFLAGS): New variables. * loader/i386/pc/linux_normal.c: New file. * loader/i386/pc/multiboot_normal.c: Likewise. * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): Don't use the attribute `unused'. * fs/ext2.c (grub_ext2_iterate_dir): Fix typos in inode type. Use `fdiro' to read the mode information from instead of `diro'. * fs/fshelp.c (grub_fshelp_find_file): Set type to foundtype after looking up a symlink. * include/grub/normal.h (GRUB_COMMAND_FLAG_NO_ARG_PARSE): New macro. * normal/command.c (grub_command_execute): Don't parse the arguments when `GRUB_COMMAND_FLAG_NO_ARG_PARSE' is set in the flags of the command. * normal/menu.c (grub_menu_run): Fix typo.
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
/* multiboot_normal.c - boot another boot loader */
|
|
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2004 Free Software Foundation, Inc.
|
|
*
|
|
* This program 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 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <grub/machine/loader.h>
|
|
#include <grub/err.h>
|
|
#include <grub/normal.h>
|
|
#include <grub/dl.h>
|
|
|
|
static grub_err_t
|
|
grub_normal_cmd_multiboot (struct grub_arg_list *state __attribute__ ((unused)),
|
|
int argc, char **args)
|
|
{
|
|
grub_rescue_cmd_multiboot (argc, args);
|
|
return grub_errno;
|
|
}
|
|
|
|
|
|
static grub_err_t
|
|
grub_normal_cmd_module (struct grub_arg_list *state __attribute__ ((unused)),
|
|
int argc, char **args)
|
|
{
|
|
grub_rescue_cmd_module (argc, args);
|
|
return grub_errno;
|
|
}
|
|
|
|
GRUB_MOD_INIT
|
|
{
|
|
(void) mod; /* To stop warning. */
|
|
grub_register_command ("multiboot", grub_normal_cmd_multiboot,
|
|
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
|
|
"multiboot FILE [ARGS...]",
|
|
"Load a multiboot kernel", 0);
|
|
|
|
grub_register_command ("module", grub_normal_cmd_module,
|
|
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_NO_ARG_PARSE,
|
|
"multiboot FILE [ARGS...]",
|
|
"Load a multiboot module", 0);
|
|
}
|
|
|
|
GRUB_MOD_FINI
|
|
{
|
|
grub_unregister_command ("multiboot");
|
|
grub_unregister_command ("module");
|
|
}
|