2003-11-16 16:36:39 +00:00
|
|
|
/* multiboot.c - boot a multiboot OS image. */
|
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB -- GRand Unified Bootloader
|
2005-02-14 18:41:33 +00:00
|
|
|
* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
|
2003-11-16 16:36:39 +00:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* FIXME: The following features from the Multiboot specification still
|
|
|
|
* need to be implemented:
|
|
|
|
* - VBE support
|
|
|
|
* - a.out support
|
|
|
|
* - boot device
|
|
|
|
* - symbol table
|
|
|
|
* - memory map
|
|
|
|
* - drives table
|
|
|
|
* - ROM configuration table
|
|
|
|
* - APM table
|
|
|
|
*/
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/loader.h>
|
|
|
|
#include <grub/machine/loader.h>
|
|
|
|
#include <grub/machine/multiboot.h>
|
|
|
|
#include <grub/machine/init.h>
|
|
|
|
#include <grub/elf.h>
|
|
|
|
#include <grub/file.h>
|
|
|
|
#include <grub/err.h>
|
|
|
|
#include <grub/rescue.h>
|
|
|
|
#include <grub/dl.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/misc.h>
|
2005-08-22 17:28:59 +00:00
|
|
|
#include <grub/gzio.h>
|
2004-04-04 13:46:03 +00:00
|
|
|
|
|
|
|
static grub_dl_t my_mod;
|
|
|
|
static struct grub_multiboot_info *mbi;
|
|
|
|
static grub_addr_t entry;
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
grub_multiboot_boot (void)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_multiboot_real_boot (entry, mbi);
|
2003-11-16 16:36:39 +00:00
|
|
|
|
|
|
|
/* Not reached. */
|
2004-04-04 13:46:03 +00:00
|
|
|
return GRUB_ERR_NONE;
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
static grub_err_t
|
|
|
|
grub_multiboot_unload (void)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
|
|
|
if (mbi)
|
|
|
|
{
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
unsigned int i;
|
2003-11-16 16:36:39 +00:00
|
|
|
for (i = 0; i < mbi->mods_count; i++)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free ((void *)
|
|
|
|
((struct grub_mod_list *) mbi->mods_addr)[i].mod_start);
|
|
|
|
grub_free ((void *)
|
|
|
|
((struct grub_mod_list *) mbi->mods_addr)[i].cmdline);
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free ((void *) mbi->mods_addr);
|
|
|
|
grub_free ((void *) mbi->cmdline);
|
|
|
|
grub_free (mbi);
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
mbi = 0;
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_dl_unref (my_mod);
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
return GRUB_ERR_NONE;
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|
|
|
|
|
2005-07-31 16:12:29 +00:00
|
|
|
/* Check if BUFFER contains ELF32. */
|
|
|
|
static int
|
|
|
|
grub_multiboot_is_elf32 (void *buffer)
|
|
|
|
{
|
|
|
|
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) buffer;
|
|
|
|
|
|
|
|
return ehdr->e_ident[EI_CLASS] == ELFCLASS32;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
grub_multiboot_load_elf32 (grub_file_t file, void *buffer)
|
|
|
|
{
|
|
|
|
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) buffer;
|
|
|
|
Elf32_Phdr *phdr;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (ehdr->e_ident[EI_CLASS] != ELFCLASS32)
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_OS, "invalid ELF class");
|
|
|
|
|
|
|
|
if (grub_dl_check_header (ehdr, sizeof(Elf32_Ehdr)))
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_OS, "no valid ELF header found");
|
|
|
|
|
|
|
|
if (ehdr->e_type != ET_EXEC)
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_OS, "invalid ELF file type");
|
|
|
|
|
|
|
|
/* FIXME: Should we support program headers at strange locations? */
|
|
|
|
if (ehdr->e_phoff + ehdr->e_phnum * ehdr->e_phentsize > GRUB_MB_SEARCH)
|
|
|
|
return grub_error (GRUB_ERR_BAD_OS, "program header at a too high offset");
|
|
|
|
|
|
|
|
entry = ehdr->e_entry;
|
|
|
|
|
|
|
|
/* Load every loadable segment in memory. */
|
|
|
|
for (i = 0; i < ehdr->e_phnum; i++)
|
|
|
|
{
|
|
|
|
phdr = (Elf32_Phdr *) ((char *) buffer + ehdr->e_phoff
|
|
|
|
+ i * ehdr->e_phentsize);
|
|
|
|
if (phdr->p_type == PT_LOAD)
|
|
|
|
{
|
|
|
|
/* The segment should fit in the area reserved for the OS. */
|
|
|
|
if ((phdr->p_paddr < grub_os_area_addr)
|
|
|
|
|| (phdr->p_paddr + phdr->p_memsz
|
|
|
|
> grub_os_area_addr + grub_os_area_size))
|
|
|
|
return grub_error (GRUB_ERR_BAD_OS,
|
|
|
|
"segment doesn't fit in memory reserved for the OS");
|
|
|
|
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
if (grub_file_seek (file, (grub_off_t) phdr->p_offset)
|
|
|
|
== (grub_off_t) -1)
|
2005-07-31 16:12:29 +00:00
|
|
|
return grub_error (GRUB_ERR_BAD_OS,
|
|
|
|
"invalid offset in program header");
|
|
|
|
|
|
|
|
if (grub_file_read (file, (void *) phdr->p_paddr, phdr->p_filesz)
|
|
|
|
!= (grub_ssize_t) phdr->p_filesz)
|
|
|
|
return grub_error (GRUB_ERR_BAD_OS,
|
|
|
|
"couldn't read segment from file");
|
|
|
|
|
|
|
|
if (phdr->p_filesz < phdr->p_memsz)
|
|
|
|
grub_memset ((char *) phdr->p_paddr + phdr->p_filesz, 0,
|
|
|
|
phdr->p_memsz - phdr->p_filesz);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if BUFFER contains ELF64. */
|
|
|
|
static int
|
|
|
|
grub_multiboot_is_elf64 (void *buffer)
|
|
|
|
{
|
|
|
|
Elf64_Ehdr *ehdr = (Elf64_Ehdr *) buffer;
|
|
|
|
|
|
|
|
return ehdr->e_ident[EI_CLASS] == ELFCLASS64;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
grub_multiboot_load_elf64 (grub_file_t file, void *buffer)
|
|
|
|
{
|
|
|
|
Elf64_Ehdr *ehdr = (Elf64_Ehdr *) buffer;
|
|
|
|
Elf64_Phdr *phdr;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (ehdr->e_ident[EI_CLASS] != ELFCLASS64)
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_OS, "invalid ELF class");
|
|
|
|
|
|
|
|
if (ehdr->e_ident[EI_MAG0] != ELFMAG0
|
|
|
|
|| ehdr->e_ident[EI_MAG1] != ELFMAG1
|
|
|
|
|| ehdr->e_ident[EI_MAG2] != ELFMAG2
|
|
|
|
|| ehdr->e_ident[EI_MAG3] != ELFMAG3
|
|
|
|
|| ehdr->e_version != EV_CURRENT
|
|
|
|
|| ehdr->e_ident[EI_DATA] != ELFDATA2LSB
|
|
|
|
|| ehdr->e_machine != EM_X86_64)
|
|
|
|
return grub_error(GRUB_ERR_UNKNOWN_OS, "no valid ELF header found");
|
|
|
|
|
|
|
|
if (ehdr->e_type != ET_EXEC)
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_OS, "invalid ELF file type");
|
|
|
|
|
|
|
|
/* FIXME: Should we support program headers at strange locations? */
|
|
|
|
if (ehdr->e_phoff + ehdr->e_phnum * ehdr->e_phentsize > GRUB_MB_SEARCH)
|
|
|
|
return grub_error (GRUB_ERR_BAD_OS, "program header at a too high offset");
|
|
|
|
|
|
|
|
/* We still in 32-bit mode */
|
|
|
|
if (ehdr->e_entry > 0xffffffff)
|
|
|
|
return grub_error (GRUB_ERR_BAD_OS, "invalid entry point for ELF64");
|
|
|
|
|
|
|
|
entry = ehdr->e_entry;
|
|
|
|
|
|
|
|
/* Load every loadable segment in memory. */
|
|
|
|
for (i = 0; i < ehdr->e_phnum; i++)
|
|
|
|
{
|
|
|
|
phdr = (Elf64_Phdr *) ((char *) buffer + ehdr->e_phoff
|
|
|
|
+ i * ehdr->e_phentsize);
|
|
|
|
if (phdr->p_type == PT_LOAD)
|
|
|
|
{
|
|
|
|
/* The segment should fit in the area reserved for the OS. */
|
|
|
|
if ((phdr->p_paddr < (grub_uint64_t) grub_os_area_addr)
|
|
|
|
|| (phdr->p_paddr + phdr->p_memsz
|
|
|
|
> ((grub_uint64_t) grub_os_area_addr
|
|
|
|
+ (grub_uint64_t) grub_os_area_size)))
|
|
|
|
return grub_error (GRUB_ERR_BAD_OS,
|
|
|
|
"segment doesn't fit in memory reserved for the OS");
|
|
|
|
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
if (grub_file_seek (file, (grub_off_t) phdr->p_offset)
|
|
|
|
== (grub_off_t) -1)
|
2005-07-31 16:12:29 +00:00
|
|
|
return grub_error (GRUB_ERR_BAD_OS,
|
|
|
|
"invalid offset in program header");
|
|
|
|
|
|
|
|
if (grub_file_read (file, (void *) ((grub_uint32_t) phdr->p_paddr),
|
|
|
|
phdr->p_filesz)
|
|
|
|
!= (grub_ssize_t) phdr->p_filesz)
|
|
|
|
return grub_error (GRUB_ERR_BAD_OS,
|
|
|
|
"couldn't read segment from file");
|
|
|
|
|
|
|
|
if (phdr->p_filesz < phdr->p_memsz)
|
|
|
|
grub_memset (((char *) ((grub_uint32_t) phdr->p_paddr)
|
|
|
|
+ phdr->p_filesz),
|
|
|
|
0,
|
|
|
|
phdr->p_memsz - phdr->p_filesz);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Load ELF32 or ELF64. */
|
|
|
|
static grub_err_t
|
|
|
|
grub_multiboot_load_elf (grub_file_t file, void *buffer)
|
|
|
|
{
|
|
|
|
if (grub_multiboot_is_elf32 (buffer))
|
|
|
|
return grub_multiboot_load_elf32 (file, buffer);
|
|
|
|
else if (grub_multiboot_is_elf64 (buffer))
|
|
|
|
return grub_multiboot_load_elf64 (file, buffer);
|
|
|
|
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_OS, "unknown ELF class");
|
|
|
|
}
|
|
|
|
|
2003-11-16 16:36:39 +00:00
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_rescue_cmd_multiboot (int argc, char *argv[])
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_t file = 0;
|
|
|
|
char buffer[GRUB_MB_SEARCH], *cmdline = 0, *p;
|
|
|
|
struct grub_multiboot_header *header;
|
|
|
|
grub_ssize_t len;
|
2003-11-16 16:36:39 +00:00
|
|
|
int i;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_dl_ref (my_mod);
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2005-07-31 16:12:29 +00:00
|
|
|
grub_loader_unset ();
|
2003-11-16 16:36:39 +00:00
|
|
|
|
|
|
|
if (argc == 0)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, "No kernel specified");
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2005-08-22 17:28:59 +00:00
|
|
|
file = grub_gzfile_open (argv[0], 1);
|
2005-07-31 16:12:29 +00:00
|
|
|
if (! file)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, "Couldn't open file");
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
len = grub_file_read (file, buffer, GRUB_MB_SEARCH);
|
2003-11-16 16:36:39 +00:00
|
|
|
if (len < 32)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_OS, "File too small");
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look for the multiboot header in the buffer. The header should
|
|
|
|
be at least 12 bytes and aligned on a 4-byte boundary. */
|
2004-04-04 13:46:03 +00:00
|
|
|
for (header = (struct grub_multiboot_header *) buffer;
|
2003-11-16 16:36:39 +00:00
|
|
|
((char *) header <= buffer + len - 12) || (header = 0);
|
2005-07-31 16:12:29 +00:00
|
|
|
header = (struct grub_multiboot_header *) ((char *) header + 4))
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
if (header->magic == GRUB_MB_MAGIC
|
2003-11-16 16:36:39 +00:00
|
|
|
&& !(header->magic + header->flags + header->checksum))
|
2005-07-31 16:12:29 +00:00
|
|
|
break;
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (header == 0)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, "No multiboot header found");
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (header->flags & GRUB_MB_UNSUPPORTED)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2005-07-31 16:12:29 +00:00
|
|
|
grub_error (GRUB_ERR_UNKNOWN_OS,
|
|
|
|
"Unsupported flag: 0x%x", header->flags);
|
2005-02-14 18:41:33 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2005-07-31 16:12:29 +00:00
|
|
|
if (grub_multiboot_load_elf (file, buffer) != GRUB_ERR_NONE)
|
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
mbi = grub_malloc (sizeof (struct grub_multiboot_info));
|
2005-07-31 16:12:29 +00:00
|
|
|
if (! mbi)
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
mbi->flags = GRUB_MB_INFO_MEMORY;
|
2003-11-16 16:36:39 +00:00
|
|
|
|
|
|
|
/* Convert from bytes to kilobytes. */
|
2004-04-04 13:46:03 +00:00
|
|
|
mbi->mem_lower = grub_lower_mem / 1024;
|
|
|
|
mbi->mem_upper = grub_upper_mem / 1024;
|
2003-11-16 16:36:39 +00:00
|
|
|
|
|
|
|
for (i = 0, len = 0; i < argc; i++)
|
2004-04-04 13:46:03 +00:00
|
|
|
len += grub_strlen (argv[i]) + 1;
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
cmdline = p = grub_malloc (len);
|
2005-07-31 16:12:29 +00:00
|
|
|
if (! cmdline)
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
p = grub_stpcpy (p, argv[i]);
|
2003-11-16 16:36:39 +00:00
|
|
|
*(p++) = ' ';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove the space after the last word. */
|
|
|
|
*(--p) = '\0';
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
mbi->flags |= GRUB_MB_INFO_CMDLINE;
|
|
|
|
mbi->cmdline = (grub_uint32_t) cmdline;
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
mbi->flags |= GRUB_MB_INFO_BOOT_LOADER_NAME;
|
|
|
|
mbi->boot_loader_name = (grub_uint32_t) grub_strdup (PACKAGE_STRING);
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2006-04-30 21:09:37 +00:00
|
|
|
grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 1);
|
2003-11-16 16:36:39 +00:00
|
|
|
|
|
|
|
fail:
|
|
|
|
if (file)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_close (file);
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_errno != GRUB_ERR_NONE)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (cmdline);
|
|
|
|
grub_free (mbi);
|
|
|
|
grub_dl_unref (my_mod);
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_rescue_cmd_module (int argc, char *argv[])
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_t file = 0;
|
|
|
|
grub_ssize_t size, len = 0;
|
2003-11-16 16:36:39 +00:00
|
|
|
char *module = 0, *cmdline = 0, *p;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (argc == 0)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, "No module specified");
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mbi)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT,
|
2003-11-16 16:36:39 +00:00
|
|
|
"You need to load the multiboot kernel first");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2005-08-22 17:28:59 +00:00
|
|
|
file = grub_gzfile_open (argv[0], 1);
|
2005-07-31 16:12:29 +00:00
|
|
|
if (! file)
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
size = grub_file_size (file);
|
|
|
|
module = grub_memalign (GRUB_MB_MOD_ALIGN, size);
|
2005-07-31 16:12:29 +00:00
|
|
|
if (! module)
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_file_read (file, module, size) != size)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < argc; i++)
|
2004-04-04 13:46:03 +00:00
|
|
|
len += grub_strlen (argv[i]) + 1;
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
cmdline = p = grub_malloc (len);
|
2005-07-31 16:12:29 +00:00
|
|
|
if (! cmdline)
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
p = grub_stpcpy (p, argv[i]);
|
2003-11-16 16:36:39 +00:00
|
|
|
*(p++) = ' ';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove the space after the last word. */
|
|
|
|
*(--p) = '\0';
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (mbi->flags & GRUB_MB_INFO_MODS)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
struct grub_mod_list *modlist = (struct grub_mod_list *) mbi->mods_addr;
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
modlist = grub_realloc (modlist, (mbi->mods_count + 1)
|
|
|
|
* sizeof (struct grub_mod_list));
|
2005-07-31 16:12:29 +00:00
|
|
|
if (! modlist)
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
2004-04-04 13:46:03 +00:00
|
|
|
mbi->mods_addr = (grub_uint32_t) modlist;
|
2003-11-16 16:36:39 +00:00
|
|
|
modlist += mbi->mods_count;
|
2004-04-04 13:46:03 +00:00
|
|
|
modlist->mod_start = (grub_uint32_t) module;
|
|
|
|
modlist->mod_end = (grub_uint32_t) module + size;
|
|
|
|
modlist->cmdline = (grub_uint32_t) cmdline;
|
2003-11-16 16:36:39 +00:00
|
|
|
modlist->pad = 0;
|
|
|
|
mbi->mods_count++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
struct grub_mod_list *modlist = grub_malloc (sizeof (struct grub_mod_list));
|
2005-07-31 16:12:29 +00:00
|
|
|
if (! modlist)
|
2003-11-16 16:36:39 +00:00
|
|
|
goto fail;
|
2004-04-04 13:46:03 +00:00
|
|
|
modlist->mod_start = (grub_uint32_t) module;
|
|
|
|
modlist->mod_end = (grub_uint32_t) module + size;
|
|
|
|
modlist->cmdline = (grub_uint32_t) cmdline;
|
2003-11-16 16:36:39 +00:00
|
|
|
modlist->pad = 0;
|
|
|
|
mbi->mods_count = 1;
|
2004-04-04 13:46:03 +00:00
|
|
|
mbi->mods_addr = (grub_uint32_t) modlist;
|
|
|
|
mbi->flags |= GRUB_MB_INFO_MODS;
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
|
|
|
if (file)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_close (file);
|
2003-11-16 16:36:39 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_errno != GRUB_ERR_NONE)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (module);
|
|
|
|
grub_free (cmdline);
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
GRUB_MOD_INIT(multiboot)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_rescue_register_command ("multiboot", grub_rescue_cmd_multiboot,
|
2003-11-16 16:36:39 +00:00
|
|
|
"load a multiboot kernel");
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_rescue_register_command ("module", grub_rescue_cmd_module,
|
2003-11-16 16:36:39 +00:00
|
|
|
"load a multiboot module");
|
|
|
|
my_mod = mod;
|
|
|
|
}
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
GRUB_MOD_FINI(multiboot)
|
2003-11-16 16:36:39 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_rescue_unregister_command ("multiboot");
|
|
|
|
grub_rescue_unregister_command ("module");
|
2003-11-16 16:36:39 +00:00
|
|
|
}
|