X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fyaboot-parser.c;h=b06248f535f35eb0c05b3e2bf2437a1516cafbdf;hp=aa993928f86c5b6121f6bce95c094f2b8f746501;hb=c3dfc9b7b91045172d460651c0309b09b0ab121a;hpb=4caf65688fd16934235139cfa5e885a62f8f7370 diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c index aa99392..b06248f 100644 --- a/discover/yaboot-parser.c +++ b/discover/yaboot-parser.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "log/log.h" #include "talloc/talloc.h" @@ -114,6 +115,13 @@ static void yaboot_finish(struct conf_context *conf) /* populate the boot option from state data */ state->opt->boot_image = create_yaboot_devpath_resource(state, conf, state->boot_image); + + char* args_sigfile_default = talloc_asprintf(opt, + "%s.cmdline.sig", state->boot_image); + state->opt->args_sig_file = create_yaboot_devpath_resource(state, + conf, args_sigfile_default); + talloc_free(args_sigfile_default); + if (state->initrd) { state->opt->initrd = create_yaboot_devpath_resource(state, conf, state->initrd); @@ -164,6 +172,7 @@ static void yaboot_finish(struct conf_context *conf) state->opt->option->is_default = true; discover_context_add_boot_option(conf->dc, state->opt); + state->opt = NULL; } static void yaboot_process_pair(struct conf_context *conf, const char *name, @@ -373,6 +382,9 @@ static int yaboot_parse(struct discover_context *dc) continue; conf_parse_buf(conf, buf, len); + device_handler_status_dev_info(dc->handler, dc->device, + _("Parsed yaboot configuration from %s"), + *filename); talloc_free(buf); }