Check if yaboot.conf files are empty

Add a yaboot parser check to ignore empty yaboot.conf files.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index c47dee13c00189d0d9e3b71da9f018e78d3b7127..d9f2aff5924f6e250074722c97dff0deaa3a66de 100644 (file)
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-parser.c
@@ -24,7 +24,12 @@ static void yaboot_finish(struct conf_context *conf)
 {
        struct yaboot_state *state = conf->parser_info;
 
-       assert(state->desc_image);
+       if (!state->desc_image) {
+               pb_log("%s: %s: no image found\n", __func__,
+                       conf->dc->device->id);
+               return;
+       }
+
        assert(state->opt);
        assert(state->opt->name);
        assert(state->opt->boot_args);