[PATCH 01/14] discover/grub2: 'search' set-variable defaults to root

[Jeremy Kerr]

If no --set= argument is specified, default to the variable named
'root', as per current grub docs.

Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
---
 discover/grub2/builtins.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/discover/grub2/builtins.c b/discover/grub2/builtins.c
index 7e92299..3f09319 100644
--- a/discover/grub2/builtins.c
+++ b/discover/grub2/builtins.c
@@ -113,7 +113,7 @@ static int builtin_search(struct grub2_script *script,
 	const char *env_var, *spec;
 	int i;
 
-	env_var = NULL;
+	env_var = "root";
 
 	for (i = 1; i < argc - 1; i++) {
 		if (!strncmp(argv[i], "--set=", strlen("--set="))) {
@@ -122,7 +122,7 @@ static int builtin_search(struct grub2_script *script,
 		}
 	}
 
-	if (!env_var)
+	if (!strlen(env_var))
 		return 0;
 
 	spec = argv[argc - 1];
-- 
2.20.1