From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Sun, 12 Apr 2009 15:11:43 +0000 (+0000)
Subject: Check if yaboot.conf files are empty
X-Git-Tag: v1.0.0~877
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=0216e1b8a561fed90f0da9d7a67954d5d67458e5

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 c47dee1..d9f2aff 100644
--- 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);