| Klaus Heinrich Kiwi | d1cd8c5 | 2020-02-27 12:43:47 -0300 | [diff] [blame] | 1 | From 3794b8f14fe94fcaa7b5cdb9171aef488f93ec7e Mon Sep 17 00:00:00 2001 |
| 2 | From: Jeremy Kerr <jk@ozlabs.org> |
| 3 | Date: Thu, 31 Oct 2019 13:56:42 +0800 |
| 4 | Subject: [PATCH 04/18] discover/grub2: 'search' set-variable defaults to root |
| 5 | |
| 6 | If no --set= argument is specified, default to the variable named |
| 7 | 'root', as per current grub docs. |
| 8 | |
| 9 | Signed-off-by: Jeremy Kerr <jk@ozlabs.org> |
| 10 | (cherry picked from commit e558da19475d747e6f8e83d07305d35da33102f9) |
| 11 | Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> |
| 12 | --- |
| 13 | discover/grub2/builtins.c | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/discover/grub2/builtins.c b/discover/grub2/builtins.c |
| 17 | index 7e92299..3f09319 100644 |
| 18 | --- a/discover/grub2/builtins.c |
| 19 | +++ b/discover/grub2/builtins.c |
| 20 | @@ -113,7 +113,7 @@ static int builtin_search(struct grub2_script *script, |
| 21 | const char *env_var, *spec; |
| 22 | int i; |
| 23 | |
| 24 | - env_var = NULL; |
| 25 | + env_var = "root"; |
| 26 | |
| 27 | for (i = 1; i < argc - 1; i++) { |
| 28 | if (!strncmp(argv[i], "--set=", strlen("--set="))) { |
| 29 | @@ -122,7 +122,7 @@ static int builtin_search(struct grub2_script *script, |
| 30 | } |
| 31 | } |
| 32 | |
| 33 | - if (!env_var) |
| 34 | + if (!strlen(env_var)) |
| 35 | return 0; |
| 36 | |
| 37 | spec = argv[argc - 1]; |
| 38 | -- |
| 39 | 2.17.1 |
| 40 | |