15a207
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
15a207
From: Peter Jones <pjones@redhat.com>
15a207
Date: Mon, 16 Jul 2018 11:00:50 -0400
15a207
Subject: [PATCH] blscfg: Get rid of the linuxefi/linux16/linux distinction
15a207
15a207
Signed-off-by: Peter Jones <pjones@redhat.com>
15a207
---
15a207
 grub-core/commands/blscfg.c | 14 +++-----------
15a207
 1 file changed, 3 insertions(+), 11 deletions(-)
15a207
15a207
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
15a207
index 53676576ba5..c6addc4dc12 100644
15a207
--- a/grub-core/commands/blscfg.c
15a207
+++ b/grub-core/commands/blscfg.c
15a207
@@ -43,14 +43,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
15a207
 #define GRUB_BOOT_DEVICE "($root)"
15a207
 #endif
15a207
 
15a207
-#ifdef GRUB_MACHINE_EFI
15a207
-#define GRUB_LINUX_CMD "linuxefi"
15a207
-#define GRUB_INITRD_CMD "initrdefi"
15a207
-#else
15a207
-#define GRUB_LINUX_CMD "linux"
15a207
-#define GRUB_INITRD_CMD "initrd"
15a207
-#endif
15a207
-
15a207
 enum
15a207
   {
15a207
     PLATFORM_EFI,
15a207
@@ -563,7 +555,7 @@ static void create_entry (struct bls_entry *entry)
15a207
 		title, id);
15a207
   if (initrds)
15a207
     {
15a207
-      int initrd_size = sizeof (GRUB_INITRD_CMD);
15a207
+      int initrd_size = sizeof ("initrd");
15a207
       char *tmp;
15a207
 
15a207
       for (i = 0; initrds != NULL && initrds[i] != NULL; i++)
15a207
@@ -579,7 +571,7 @@ static void create_entry (struct bls_entry *entry)
15a207
 	}
15a207
 
15a207
 
15a207
-      tmp = grub_stpcpy(initrd, GRUB_INITRD_CMD);
15a207
+      tmp = grub_stpcpy(initrd, "initrd ");
15a207
       for (i = 0; initrds != NULL && initrds[i] != NULL; i++)
15a207
 	{
15a207
 	  grub_dprintf ("blscfg", "adding initrd %s\n", initrds[i]);
15a207
@@ -592,7 +584,7 @@ static void create_entry (struct bls_entry *entry)
15a207
   src = grub_xasprintf ("load_video\n"
15a207
 			"set gfx_payload=keep\n"
15a207
 			"insmod gzio\n"
15a207
-			GRUB_LINUX_CMD " %s%s%s%s\n"
15a207
+			"linux %s%s%s%s\n"
15a207
 			"%s",
15a207
 			GRUB_BOOT_DEVICE, clinux, options ? " " : "", options ? options : "",
15a207
 			initrd ? initrd : "");