dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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