2010-01-18 Robert Millan <rmh.grub@aybabtu.com>

	* loader/i386/efi/linux.c (grub_cmd_linux): Stop pretending we're
	ELILO.  This is no longer necessary.

diff --git a/ChangeLog b/ChangeLog
index 963d91514ad479ff5f28e712526dfd31001f57e3..f44ecc714b19af7f4a24b22d871aac0f5ed4ce17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * loader/i386/efi/linux.c (grub_cmd_linux): Stop pretending we're
+       ELILO.  This is no longer necessary.
+
 2010-01-18  BVK Chaitanya  <bvk.groups@gmail.com>
 
        Added new tool, grub-scrit-check to verify grub.cfg syntax.

diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 2e26f392926cc85bbc8a168085eed90a65172d32..053c3ed22d9f2c562e91f276d40d97dc512b07bb 100644 (file)
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009,2010  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
@@ -676,8 +676,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  /* XXX Linux assumes that only elilo can boot Linux on EFI!!!  */
-  params->type_of_loader = (LINUX_LOADER_ID_ELILO << 4);
+  params->type_of_loader = (LINUX_LOADER_ID_GRUB << 4);
 
   params->cl_magic = GRUB_LINUX_CL_MAGIC;
   params->cl_offset = 0x1000;