discover/grub2: Add grub2/grub.cfg config file
[petitboot] / discover / grub2-parser.c
index 3c756c1b0f5230f120253d0d62568870459af349..cb9635e64122d766a4fc086e89b52fd13f25fac1 100644 (file)
 #include "types/types.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
-#include "paths.h"
+#include "resource.h"
 
 struct grub2_state {
-       struct boot_option *opt;
+       struct discover_boot_option *opt;
        char *desc_image;
        char *desc_initrd;
        const char *const *known_names;
@@ -43,6 +43,7 @@ static void grub2_finish(struct conf_context *conf)
 {
        struct device *dev = conf->dc->device->device;
        struct grub2_state *state = conf->parser_info;
+       struct boot_option *opt;
 
        if (!state->desc_image) {
                pb_log("%s: %s: no image found\n", __func__, dev->id);
@@ -50,29 +51,28 @@ static void grub2_finish(struct conf_context *conf)
        }
 
        assert(state->opt);
-       assert(state->opt->name);
-       assert(state->opt->boot_args);
+       opt = state->opt->option;
+
+       assert(opt);
+       assert(opt->name);
+       assert(opt->boot_args);
 
-       state->opt->description = talloc_asprintf(state->opt, "%s %s %s",
+       opt->description = talloc_asprintf(opt, "%s %s %s",
                state->desc_image,
                (state->desc_initrd ? state->desc_initrd : ""),
-               state->opt->boot_args);
+               opt->boot_args);
 
        talloc_free(state->desc_initrd);
        state->desc_initrd = NULL;
 
-       conf_strip_str(state->opt->boot_args);
-       conf_strip_str(state->opt->description);
+       conf_strip_str(opt->boot_args);
+       conf_strip_str(opt->description);
 
        /* opt is persistent, so must be associated with device */
 
        discover_context_add_boot_option(conf->dc, state->opt);
 
-       state->opt = talloc_zero(conf->dc, struct boot_option);
-       state->opt->boot_args = talloc_strdup(state->opt, "");
-
-       talloc_free(state->desc_image);
-       state->desc_image = NULL;
+       state->opt = NULL;
 }
 
 static void grub2_process_pair(struct conf_context *conf, const char *name,
@@ -80,6 +80,7 @@ static void grub2_process_pair(struct conf_context *conf, const char *name,
 {
        struct device *dev = conf->dc->device->device;
        struct grub2_state *state = conf->parser_info;
+       struct discover_boot_option *opt = state->opt;
 
        if (!name || !conf_param_in_list(state->known_names, name))
                return;
@@ -87,18 +88,25 @@ static void grub2_process_pair(struct conf_context *conf, const char *name,
        if (streq(name, "menuentry")) {
                char *sep;
 
-               grub2_finish(conf);
+               /* complete any existing option... */
+               if (state->opt)
+                       grub2_finish(conf);
 
-               /* Then start the new image. */
+               /* ... then start the new one */
+               opt = discover_boot_option_create(conf->dc, conf->dc->device);
+               opt->option->boot_args = talloc_strdup(opt->option, "");
 
                sep = strchr(value, '\'');
 
                if (sep)
                        *sep = 0;
 
-               state->opt->id = talloc_asprintf(state->opt, "%s#%s",
-                       dev->id, value);
-               state->opt->name = talloc_strdup(state->opt, value);
+               opt->option->id = talloc_asprintf(opt->option,
+                                       "%s#%s", dev->id, value);
+               opt->option->name = talloc_strdup(opt->option, value);
+               opt->option->boot_args = talloc_strdup(opt, "");
+
+               state->opt = opt;
 
                return;
        }
@@ -111,20 +119,19 @@ static void grub2_process_pair(struct conf_context *conf, const char *name,
                if (sep)
                        *sep = 0;
 
-               state->opt->boot_image_file = resolve_path(state->opt,
-                       value, conf->dc->device->device_path);
-               state->desc_image = talloc_strdup(state->opt, value);
+               opt->boot_image = create_devpath_resource(opt,
+                                       conf->dc->device, value);
+               state->desc_image = talloc_strdup(opt, value);
 
                if (sep)
-                       state->opt->boot_args = talloc_strdup(state->opt,
-                               sep + 1);
+                       opt->option->boot_args = talloc_strdup(opt, sep + 1);
 
                return;
        }
 
        if (streq(name, "initrd")) {
-               state->opt->initrd_file = resolve_path(state->opt,
-                       value, conf->dc->device->device_path);
+               opt->initrd = create_devpath_resource(opt,
+                                       conf->dc->device, value);
                state->desc_initrd = talloc_asprintf(state, "initrd=%s",
                        value);
                return;
@@ -137,12 +144,14 @@ static const char *const grub2_conf_files[] = {
        "/grub.cfg",
        "/menu.lst",
        "/grub/grub.cfg",
+       "/grub2/grub.cfg",
        "/grub/menu.lst",
        "/boot/grub/grub.cfg",
        "/boot/grub/menu.lst",
        "/GRUB.CFG",
        "/MENU.LST",
        "/GRUB/GRUB.CFG",
+       "/GRUB2/GRUB.CFG",
        "/GRUB/MENU.LST",
        "/BOOT/GRUB/GRUB.CFG",
        "/BOOT/GRUB/MENU.LST",
@@ -175,19 +184,18 @@ static int grub2_parse(struct discover_context *dc, char *buf, int len)
 
        state->known_names = grub2_known_names;
 
-       /* opt is persistent, so must be associated with device */
-
-       state->opt = talloc_zero(conf->dc->device, struct boot_option);
-       state->opt->boot_args = talloc_strdup(state->opt, "");
-
        conf_parse_buf(conf, buf, len);
 
        talloc_free(conf);
        return 1;
 }
 
-struct parser __grub2_parser = {
-       .name           = "grub2",
-       .parse          = grub2_parse,
-       .filenames      = grub2_conf_files,
+static struct parser grub2_parser = {
+       .name                   = "grub2",
+       .method                 = CONF_METHOD_LOCAL_FILE,
+       .parse                  = grub2_parse,
+       .filenames              = grub2_conf_files,
+       .resolve_resource       = resolve_devpath_resource,
 };
+
+register_parser(grub2_parser);