merge with mainline

This commit is contained in:
BVK Chaitanya 2010-07-18 21:34:03 +05:30
commit 502cddef68
19 changed files with 1544 additions and 560 deletions

View file

@ -220,7 +220,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
if (! elf)
goto out;
if (elf->ehdr.ehdr32.e_type != ET_EXEC)
if (elf->ehdr.ehdr32.e_type != ET_EXEC && elf->ehdr.ehdr32.e_type != ET_DYN)
{
grub_error (GRUB_ERR_UNKNOWN_OS,
"this ELF file is not of the right type");