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

* util/grub.d/30_os-prober.in: Fix occurence of grub-probe instead of

Browse source 
grub_probe.
	Reported by: adamwill
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-13 13:54:24 +01:00
parent 7e532280bd
commit 3c76ea0c2c
8 changed files with 187 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

44
grub-core/loader/i386/linux.c
View file

@ -941,12 +941,15 @@ static grub_err_t
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[])
{
grub_file_t file = 0;
grub_ssize_t size;
grub_file_t *files = 0;
grub_size_t size = 0;
grub_addr_t addr_min, addr_max;
grub_addr_t addr;
grub_err_t err;
struct linux_kernel_header *lh;
int i;
int nfiles = 0;
grub_uint8_t *ptr;
if (argc == 0)
{
@ -960,12 +963,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail;
}
grub_file_filter_disable_compression ();
file = grub_file_open (argv[0]);
if (! file)
files = grub_zalloc (argc * sizeof (files[0]));
if (!files)
goto fail;
size = grub_file_size (file);
for (i = 0; i < argc; i++)
{
grub_file_filter_disable_compression ();
files[i] = grub_file_open (argv[i]);
if (! files[i])
goto fail;
nfiles++;
size += grub_file_size (files[i]);
}
initrd_pages = (page_align (size) >> 12);
lh = (struct linux_kernel_header *) real_mode_mem;
@ -1017,12 +1028,18 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
initrd_mem_target = get_physical_target_address (ch);
}
if (grub_file_read (file, initrd_mem, size) != size)
ptr = initrd_mem;
for (i = 0; i < nfiles; i++)
{
if (!grub_errno)
grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
argv[0]);
goto fail;
grub_ssize_t cursize = grub_file_size (files[i]);
if (grub_file_read (files[i], ptr, cursize) != cursize)
{
if (!grub_errno)
grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
argv[i]);
goto fail;
}
ptr += cursize;
}
grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
@ -1033,8 +1050,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
lh->root_dev = 0x0100; /* XXX */
fail:
if (file)
grub_file_close (file);
for (i = 0; i < nfiles; i++)
grub_file_close (files[i]);
grub_free (files);
return grub_errno;
}