discover/grub: Use different paths to search for the BLS directory

[petitboot] / discover / grub2 / blscfg.c

diff --git a/discover/grub2/blscfg.c b/discover/grub2/blscfg.c
index 5dadd2c6e8efde1ccf2eaf37af2893f4825c1cef..a3813064a0a3daa30d47c168e4a54081e5b2c902 100644 (file)
--- a/discover/grub2/blscfg.c
+++ b/discover/grub2/blscfg.c
@@ -15,11 +15,16 @@
 #include "discover/parser-conf.h"
 #include "discover/parser.h"
 
-#define BLS_DIR "/loader/entries"
+static const char *const bls_dirs[] = {
+       "/loader/entries",
+       "/boot/loader/entries",
+       NULL
+};
 
 struct bls_state {
        struct discover_boot_option *opt;
        struct grub2_script *script;
+       unsigned int idx;
        const char *filename;
        const char *title;
        const char *version;
@@ -81,19 +86,25 @@ static void bls_process_pair(struct conf_context *conf, const char *name,
        }
 }
 
-static bool option_is_default(struct grub2_script *script,
+static bool option_is_default(struct bls_state *state,
                              struct boot_option *option)
 {
+       unsigned int idx;
        const char *var;
+       char *end;
 
-       var = script_env_get(script, "default");
+       var = script_env_get(state->script, "default");
        if (!var)
                return false;
 
        if (!strcmp(var, option->id))
                return true;
 
-       return !strcmp(var, option->name);
+       if (!strcmp(var, option->name))
+               return true;
+
+       idx = strtoul(var, &end, 10);
+       return end != var && *end == '\0' && idx == state->idx;
 }
 
 static void bls_finish(struct conf_context *conf)
@@ -141,7 +152,13 @@ static void bls_finish(struct conf_context *conf)
                opt->dtb = create_grub2_resource(opt, conf->dc->device,
                                                 root, state->dtb);
 
-       option->is_default = option_is_default(state->script, option);
+       char* args_sigfile_default = talloc_asprintf(opt,
+               "%s.cmdline.sig", state->image);
+       opt->args_sig_file = create_grub2_resource(opt, conf->dc->device,
+                                               root, args_sigfile_default);
+       talloc_free(args_sigfile_default);
+
+       option->is_default = option_is_default(state, option);
 
        list_add_tail(&state->script->options, &opt->list);
        state->script->n_options++;
@@ -176,13 +193,16 @@ int builtin_blscfg(struct grub2_script *script,
                int argc __attribute__((unused)),
                char *argv[] __attribute__((unused)))
 {
+       unsigned int current_idx = script->n_options;
        struct discover_context *dc = script->ctx;
        struct dirent **bls_entries;
        struct conf_context *conf;
        struct bls_state *state;
        char *buf, *filename;
+       const char * const *dir;
        const char *blsdir;
        int n, len, rc = -1;
+       struct stat statbuf;
 
        conf = talloc_zero(dc, struct conf_context);
        if (!conf)
@@ -195,7 +215,17 @@ int builtin_blscfg(struct grub2_script *script,
 
        blsdir = script_env_get(script, "blsdir");
        if (!blsdir)
-               blsdir = BLS_DIR;
+               for (dir = bls_dirs; *dir; dir++)
+                       if (!parser_stat_path(dc, dc->device, *dir, &statbuf)) {
+                               blsdir = *dir;
+                               break;
+                       }
+
+       if (!blsdir) {
+               device_handler_status_dev_info(dc->handler, dc->device,
+                                              _("BLS directory wasn't found"));
+               goto err;
+       }
 
        n = parser_scandir(dc, blsdir, &bls_entries, bls_filter, bls_sort);
        if (n <= 0)
@@ -217,6 +247,7 @@ int builtin_blscfg(struct grub2_script *script,
 
                state->script = script;
                state->filename = filename;
+               state->idx = current_idx++;
                conf->parser_info = state;
 
                rc = parser_request_file(dc, dc->device, filename, &buf, &len);
@@ -234,7 +265,7 @@ int builtin_blscfg(struct grub2_script *script,
        if (n > 0) {
                device_handler_status_dev_info(dc->handler, dc->device,
                                               _("Scanning %s failed"),
-                                              BLS_DIR);
+                                              blsdir);
                do {
                        free(bls_entries[n]);
                } while (n-- > 0);