--- trunk/grubby/grubby.c	2016/06/30 10:27:31	2983
+++ trunk/grubby/grubby.c	2016/06/30 10:30:31	2986
@@ -4424,9 +4424,11 @@
     }
 
     if (!cfi) {
-        if (grub2FindConfig(&grub2ConfigType))
+        if (grub2FindConfig(&grub2ConfigType)) {
 	    cfi = &grub2ConfigType;
-	else
+	    if (envPath)
+		cfi->envFile = envPath;
+        } else
       #ifdef __ia64__
 	    cfi = &eliloConfigType;
       #elif __powerpc__