--- trunk/grubby/grubby.c	2020/07/07 11:09:37	3136
+++ trunk/grubby/grubby.c	2020/07/07 11:10:21	3137
@@ -5154,22 +5154,27 @@
 	if (!cfi) {
 		if (grub2FindConfig(&grub2ConfigType)) {
 			cfi = &grub2ConfigType;
+			configureGrub2 = 1;
 			if (envPath)
 				cfi->envFile = envPath;
-		} else
+		} else {
 #ifdef __ia64__
 			cfi = &eliloConfigType;
-#elif __powerpc__
+			configureLilo = 1;
+#elif defined(__powerpc__)
 			cfi = &yabootConfigType;
-#elif __sparc__
+			configureYaboot = 1;
+#elif defined(__sparc__)
 			cfi = &siloConfigType;
-#elif __s390__
+			configureSilo = 1;
+#elif defined(__s390__) || defined(__s390x__)
 			cfi = &ziplConfigType;
-#elif __s390x__
-			cfi = &ziplConfigtype;
+			configureZipl = 1;
 #else
 			cfi = &grubConfigType;
+			configureGrub = 1;
 #endif
+		}
 	}
 
 	if (!grubConfig) {