dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch

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