3bd0a12aca
* disk/memdisk.c (memdisk_size): Don't initialize.
(GRUB_MOD_INIT(memdisk)): Find memdisk using grub_module_iterate().
* include/grub/i386/pc/kernel.h
(GRUB_KERNEL_MACHINE_MEMDISK_IMAGE_SIZE): Remove macro.
(GRUB_KERNEL_MACHINE_PREFIX, GRUB_KERNEL_MACHINE_DATA_END): Shift.
(grub_memdisk_image_size, grub_arch_memdisk_addr)
(grub_arch_memdisk_size): Remove.
* include/grub/kernel.h (struct grub_module_header): Remove `offset'
field (was only used to transfer a constant). Add `type' field to
support multiple module types.
(grub_module_iterate): New function.
* kern/device.c (grub_device_open): Do not hide error messages
when grub_disk_open() fails. Use grub_print_error() instead.
* kern/i386/pc/init.c (grub_arch_modules_addr)
(grub_arch_memdisk_size): Remove functions.
(grub_arch_modules_addr): Return the module address in high memory
(now that it isn't copied anymore).
* kern/i386/pc/startup.S (grub_memdisk_image_size): Remove variable.
(codestart): Don't add grub_memdisk_image_size to %ecx in LZMA
decompression routine (grub_total_module_size already includes that
now). Don't copy modules back to low memory.
* kern/main.c: Include `<grub/mm.h>'.
(grub_load_modules): Split out (and use) ...
(grub_module_iterate): ... this function, which iterates through
module objects and runs a hook.
Comment out grub_mm_init_region() call, as it would cause non-ELF
modules to be overwritten.
* util/i386/pc/grub-mkimage.c (generate_image): Instead of appending
the memdisk image in its own region, make it part of the module list.
* util/elf/grub-mkimage.c (options): Add "memdisk"|'m' option.
(main): Parse --memdisk|-m option, and pass user-provided path as
parameter to generate_image().
(add_segments): Pass `memdisk_path' down to load_modules().
(load_modules): Embed memdisk image in module section when requested.
* util/i386/efi/grub-mkimage.c (make_mods_section): Initialize
`header.type' instead of `header.offset'.
* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Add `memdisk.mod'.
(memdisk_mod_SOURCES, memdisk_mod_CFLAGS)
(memdisk_mod_LDFLAGS): New variables.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
140 lines
3.1 KiB
C
140 lines
3.1 KiB
C
/* device.c - device manager */
|
|
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2002,2005,2007,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/device.h>
|
|
#include <grub/disk.h>
|
|
#include <grub/net.h>
|
|
#include <grub/fs.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/env.h>
|
|
#include <grub/partition.h>
|
|
|
|
grub_device_t
|
|
grub_device_open (const char *name)
|
|
{
|
|
grub_disk_t disk = 0;
|
|
grub_device_t dev = 0;
|
|
|
|
if (! name)
|
|
{
|
|
name = grub_env_get ("root");
|
|
if (*name == '\0')
|
|
{
|
|
grub_error (GRUB_ERR_BAD_DEVICE, "no device is set");
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
dev = grub_malloc (sizeof (*dev));
|
|
if (! dev)
|
|
goto fail;
|
|
|
|
/* Try to open a disk. */
|
|
disk = grub_disk_open (name);
|
|
if (! disk)
|
|
{
|
|
grub_print_error ();
|
|
grub_errno = GRUB_ERR_NONE;
|
|
goto fail;
|
|
}
|
|
|
|
dev->disk = disk;
|
|
dev->net = 0; /* FIXME */
|
|
|
|
return dev;
|
|
|
|
fail:
|
|
if (disk)
|
|
grub_disk_close (disk);
|
|
|
|
grub_free (dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
grub_err_t
|
|
grub_device_close (grub_device_t device)
|
|
{
|
|
if (device->disk)
|
|
grub_disk_close (device->disk);
|
|
|
|
grub_free (device);
|
|
|
|
return grub_errno;
|
|
}
|
|
|
|
int
|
|
grub_device_iterate (int (*hook) (const char *name))
|
|
{
|
|
auto int iterate_disk (const char *disk_name);
|
|
auto int iterate_partition (grub_disk_t disk,
|
|
const grub_partition_t partition);
|
|
|
|
int iterate_disk (const char *disk_name)
|
|
{
|
|
grub_device_t dev;
|
|
|
|
if (hook (disk_name))
|
|
return 1;
|
|
|
|
dev = grub_device_open (disk_name);
|
|
if (! dev)
|
|
return 0;
|
|
|
|
if (dev->disk && dev->disk->has_partitions)
|
|
if (grub_partition_iterate (dev->disk, iterate_partition))
|
|
{
|
|
grub_device_close (dev);
|
|
return 1;
|
|
}
|
|
|
|
grub_device_close (dev);
|
|
return 0;
|
|
}
|
|
|
|
int iterate_partition (grub_disk_t disk, const grub_partition_t partition)
|
|
{
|
|
char *partition_name;
|
|
char *device_name;
|
|
int ret;
|
|
|
|
partition_name = grub_partition_get_name (partition);
|
|
if (! partition_name)
|
|
return 1;
|
|
|
|
device_name = grub_malloc (grub_strlen (disk->name) + 1
|
|
+ grub_strlen (partition_name) + 1);
|
|
if (! device_name)
|
|
{
|
|
grub_free (partition_name);
|
|
return 1;
|
|
}
|
|
|
|
grub_sprintf (device_name, "%s,%s", disk->name, partition_name);
|
|
grub_free (partition_name);
|
|
|
|
ret = hook (device_name);
|
|
grub_free (device_name);
|
|
return ret;
|
|
}
|
|
|
|
/* Only disk devices are supported at the moment. */
|
|
return grub_disk_dev_iterate (iterate_disk);
|
|
}
|