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