* grub-core/commands/legacycfg.c: Use 32-bit Linux protocol on non-BIOS.

diff --git a/ChangeLog b/ChangeLog
index 09f9cd9464cdaa8ab0e707e68e1807fc8540dfd5..2081bc7f5099de6716b1e6d83572b9287850b190 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/legacycfg.c: Use 32-bit Linux protocol on non-BIOS.
+
 2013-12-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Support cpuid --pae.

diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
index f429a5d1b9b6d13c44a4cf041b28108080fe005b..e42a9d83ebb17d35817183ba3eba48e252e85351 100644 (file)
--- a/grub-core/commands/legacycfg.c
+++ b/grub-core/commands/legacycfg.c
@@ -314,7 +314,11 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
       /* First try Linux.  */
       if (kernel_type == GUESS_IT || kernel_type == LINUX)
        {
+#ifdef GRUB_MACHINE_PCBIOS
          cmd = grub_command_find ("linux16");
+#else
+         cmd = grub_command_find ("linux");
+#endif
          if (cmd)
            {
              if (!(cmd->func) (cmd, cutargc, cutargs))
@@ -469,10 +473,19 @@ grub_cmd_legacy_initrd (struct grub_command *mycmd __attribute__ ((unused)),
 
   if (kernel_type == LINUX)
     {
+#ifdef GRUB_MACHINE_PCBIOS
       cmd = grub_command_find ("initrd16");
+#else
+      cmd = grub_command_find ("initrd");
+#endif
       if (!cmd)
        return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"),
-                          "initrd16");
+#ifdef GRUB_MACHINE_PCBIOS
+                          "initrd16"
+#else
+                          "initrd"
+#endif
+                          );
 
       return cmd->func (cmd, argc, args);
     }