Blame SOURCES/0047-grubby-Make-sure-configure-BOOTLOADER-variables-are-.patch

cca0c4
From 19b47a3eab1b4fc490e007caaa9597595f15f496 Mon Sep 17 00:00:00 2001
cca0c4
From: Peter Jones <pjones@redhat.com>
cca0c4
Date: Wed, 31 Jan 2018 13:06:48 -0500
cca0c4
Subject: [PATCH 47/55] grubby: Make sure configure$BOOTLOADER variables are
cca0c4
 set correctly.
cca0c4
cca0c4
When we've chosen a bootloader because it's default for a platform, and
cca0c4
we've already determined it's not overridden by the command line, set
cca0c4
the configure$BOOTLOADER variable to 1 so that our checks for which
cca0c4
bootloader are selected work correctly.
cca0c4
cca0c4
Resolves: rhbz#1340893
cca0c4
cca0c4
Signed-off-by: Peter Jones <pjones@redhat.com>
cca0c4
---
cca0c4
 grubby.c | 17 +++++++++++------
cca0c4
 1 file changed, 11 insertions(+), 6 deletions(-)
cca0c4
cca0c4
diff --git a/grubby.c b/grubby.c
cca0c4
index 9af04dea01b..c1b4104892c 100644
cca0c4
--- a/grubby.c
cca0c4
+++ b/grubby.c
cca0c4
@@ -5151,22 +5151,27 @@ int main(int argc, const char **argv)
cca0c4
 	if (!cfi) {
cca0c4
 		if (grub2FindConfig(&grub2ConfigType)) {
cca0c4
 			cfi = &grub2ConfigType;
cca0c4
+			configureGrub2 = 1;
cca0c4
 			if (envPath)
cca0c4
 				cfi->envFile = envPath;
cca0c4
-		} else
cca0c4
+		} else {
cca0c4
 #ifdef __ia64__
cca0c4
 			cfi = &eliloConfigType;
cca0c4
-#elif __powerpc__
cca0c4
+			configureLilo = 1;
cca0c4
+#elif defined(__powerpc__)
cca0c4
 			cfi = &yabootConfigType;
cca0c4
-#elif __sparc__
cca0c4
+			configureYaboot = 1;
cca0c4
+#elif defined(__sparc__)
cca0c4
 			cfi = &siloConfigType;
cca0c4
-#elif __s390__
cca0c4
+			configureSilo = 1;
cca0c4
+#elif defined(__s390__) || defined(__s390x__)
cca0c4
 			cfi = &ziplConfigType;
cca0c4
-#elif __s390x__
cca0c4
-			cfi = &ziplConfigtype;
cca0c4
+			configureZipl = 1;
cca0c4
 #else
cca0c4
 			cfi = &grubConfigType;
cca0c4
+			configureGrub = 1;
cca0c4
 #endif
cca0c4
+		}
cca0c4
 	}
cca0c4
 
cca0c4
 	if (!grubConfig) {
cca0c4
-- 
cca0c4
2.17.1
cca0c4