dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0262-Remove-bogus-load_env-after-blscfg-command-in-10_lin.patch

8631a2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8631a2
From: Javier Martinez Canillas <javierm@redhat.com>
8631a2
Date: Tue, 14 May 2019 20:37:44 +0200
8631a2
Subject: [PATCH] Remove bogus load_env after blscfg command in 10_linux
8631a2
8631a2
The grubenv is already loaded in the 00_header snippet, so there's
8631a2
no need to load it anywhere else.
8631a2
8631a2
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
8631a2
---
8631a2
 util/grub.d/10_linux.in | 3 ---
8631a2
 1 file changed, 3 deletions(-)
8631a2
8631a2
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
8631a2
index 04fd8953f40..58d18504790 100644
8631a2
--- a/util/grub.d/10_linux.in
8631a2
+++ b/util/grub.d/10_linux.in
8631a2
@@ -162,9 +162,6 @@ set default_kernelopts="root=${linux_root_device_thisversion} ro ${args}"
8631a2
 
8631a2
 insmod blscfg
8631a2
 blscfg
8631a2
-if [ -s \$prefix/grubenv ]; then
8631a2
-  load_env
8631a2
-fi
8631a2
 EOF
8631a2
 
8631a2
     if [ "x${GRUB_GRUBENV_UPDATE}" = "xyes" ]; then