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

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