discover: log unresolved boot options

[petitboot] / discover / kboot-parser.c

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index ab508ec8df5b253ca7617c670693e0dbb22e2e61..f0976746ee80241e679124ee443e3b4a1193b983 100644 (file)
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -6,22 +6,23 @@
 
 #include "log/log.h"
 #include "talloc/talloc.h"
-#include "pb-protocol/pb-protocol.h"
+#include "types/types.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
-#include "paths.h"
+#include "resource.h"
 
 static void kboot_process_pair(struct conf_context *conf, const char *name,
                char *value)
 {
        const char *const *ignored_names = conf->parser_info;
+       struct discover_boot_option *d_opt;
+       struct boot_option *opt;
        char *pos;
        char *args;
        const char *initrd;
        const char *root;
-       struct boot_option *opt;
 
-       /* fixup for bare values */
+       /* ignore bare values */
 
        if (!name)
                return;
@@ -34,12 +35,15 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
 
        /* opt must be associated with dc */
 
-       opt = talloc_zero(conf->dc->device, struct boot_option);
+       d_opt = talloc_zero(conf->dc, struct discover_boot_option);
+       d_opt->device = conf->dc->device;
+       opt = talloc_zero(d_opt, struct boot_option);
 
        if (!opt)
                return;
 
-       opt->id = talloc_asprintf(opt, "%s#%s", conf->dc->device->id, name);
+       opt->id = talloc_asprintf(opt, "%s#%s", conf->dc->device->device->id,
+                       name);
        opt->name = talloc_strdup(opt, name);
 
        args = talloc_strdup(opt, "");
@@ -79,7 +83,8 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
        }
 
 out_add:
-       opt->boot_image_file = resolve_path(opt, value, conf->dc->device_path);
+       d_opt->boot_image = create_devpath_resource(opt,
+                               conf->dc->device, value);
 
        if (root) {
                opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args);
@@ -88,8 +93,8 @@ out_add:
                opt->boot_args = args;
 
        if (initrd) {
-               opt->initrd_file = resolve_path(opt, initrd,
-                               conf->dc->device_path);
+               d_opt->initrd = create_devpath_resource(opt,
+                               conf->dc->device, initrd);
 
                opt->description = talloc_asprintf(opt, "%s initrd=%s %s",
                        value, initrd, opt->boot_args);
@@ -100,7 +105,7 @@ out_add:
        conf_strip_str(opt->boot_args);
        conf_strip_str(opt->description);
 
-       device_add_boot_option(conf->dc->device, opt);
+       discover_context_add_boot_option(conf->dc, d_opt);
 }
 
 static struct conf_global_option kboot_global_options[] = {
@@ -130,10 +135,9 @@ static const char *const kboot_ignored_names[] = {
        NULL
 };
 
-static int kboot_parse(struct discover_context *dc)
+static int kboot_parse(struct discover_context *dc, char *buf, int len)
 {
        struct conf_context *conf;
-       int rc;
 
        conf = talloc_zero(dc, struct conf_context);
 
@@ -143,14 +147,22 @@ static int kboot_parse(struct discover_context *dc)
        conf->dc = dc;
        conf->global_options = kboot_global_options,
        conf_init_global_options(conf);
-       conf->conf_files = kboot_conf_files,
+       conf->get_pair = conf_get_pair_equal;
        conf->process_pair = kboot_process_pair;
        conf->parser_info = (void *)kboot_ignored_names,
 
-       rc = conf_parse(conf);
+       conf_parse_buf(conf, buf, len);
 
        talloc_free(conf);
-       return rc;
+       return 1;
 }
 
-define_parser(kboot, kboot_parse);
+static struct parser kboot_parser = {
+       .name                   = "kboot",
+       .method                 = CONF_METHOD_LOCAL_FILE,
+       .parse                  = kboot_parse,
+       .filenames              = kboot_conf_files,
+       .resolve_resource       = resolve_devpath_resource,
+};
+
+register_parser(kboot_parser);