discover: fix segfault on failed boot image load

[petitboot] / discover / event-parser.c

diff --git a/discover/event-parser.c b/discover/event-parser.c
index 45d7b3a3ed56b24fee4f9af904696f530a0ff1ba..99e2654b2dc22ba3b616590b61209e52fc1e719f 100644 (file)
--- a/discover/event-parser.c
+++ b/discover/event-parser.c
@@ -64,7 +64,6 @@ int parse_user_event(struct discover_context *ctx, struct event *event)
        }
 
        opt->id = talloc_asprintf(opt, "%s#%s", dev->id, p);
-       opt->device_id = talloc_strdup(opt, dev->id);
        opt->name = talloc_strdup(opt, p);
 
        d_opt->boot_image = user_event_resource(d_opt, event, "image");
@@ -84,6 +83,9 @@ int parse_user_event(struct discover_context *ctx, struct event *event)
        opt->description = talloc_asprintf(opt, "%s %s", opt->boot_image_file,
                opt->boot_args ? : "");
 
+       if (event_get_param(event, "default"))
+               opt->is_default = true;
+
        discover_context_add_boot_option(ctx, d_opt);
 
        return 0;