diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2019-10-31 13:56:42 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2019-11-29 13:54:10 +0800 |
commit | e558da19475d747e6f8e83d07305d35da33102f9 (patch) | |
tree | e8e8c28fb1334a62b30f807899a8fe62c9c34f75 /discover/grub2 | |
parent | 3c818a27ddb6bbc71667c7f2ceb57be37b31bc6f (diff) | |
download | talos-petitboot-e558da19475d747e6f8e83d07305d35da33102f9.tar.gz talos-petitboot-e558da19475d747e6f8e83d07305d35da33102f9.zip |
discover/grub2: 'search' set-variable defaults to root
If no --set= argument is specified, default to the variable named
'root', as per current grub docs.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/grub2')
-rw-r--r-- | discover/grub2/builtins.c | 4 |
1 files 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]; |