X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fyaboot-parser.c;h=6101cd89f12ec8c0540b2701a7017cd2621f7de6;hp=d58919800ae857d98eda105f3d5a656e89618b7d;hb=303177dbca468752721daf8d6cb8e87b6e54d5be;hpb=4d1d4bf2f4c97b489472f6d1db95d15a6e09ea3d

diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index d589198..6101cd8 100644
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-parser.c
@@ -85,6 +85,8 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 	/* image */
 
 	if (streq(name, "image")) {
+		const char *g_boot = conf_get_global_option(conf, "boot");
+		const char *g_part = conf_get_global_option(conf, "partition");
 
 		/* First finish any previous image. */
 
@@ -93,9 +95,25 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 
 		/* Then start the new image. */
 
-		state->opt->boot_image_file = resolve_path(state->opt, value,
-			conf->dc->device_path);
-		state->desc_image = talloc_strdup(state->opt, value);
+		if (g_boot && g_part) {
+			char* dev = talloc_asprintf(NULL, "%s%s", g_boot,
+				g_part);
+
+			state->opt->boot_image_file = resolve_path(state->opt,
+				value, dev);
+			state->desc_image = talloc_asprintf(state->opt,
+				"%s%s", dev, value);
+			talloc_free(dev);
+		} else if (g_boot) {
+			state->opt->boot_image_file = resolve_path(state->opt,
+				value, g_boot);
+			state->desc_image = talloc_asprintf(state->opt,
+				"%s%s", g_boot, value);
+		} else {
+			state->opt->boot_image_file = resolve_path(state->opt,
+				value, conf->dc->device_path);
+			state->desc_image = talloc_strdup(state->opt, value);
+		}
 
 		return;
 	}
@@ -144,10 +162,29 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 	/* initrd */
 
 	if (streq(name, "initrd")) {
-		state->opt->initrd_file = resolve_path(state->opt,
-			value, conf->dc->device_path);
-		state->desc_initrd = talloc_asprintf(state, "initrd=%s",
-			value);
+		const char *g_boot = conf_get_global_option(conf, "boot");
+		const char *g_part = conf_get_global_option(conf, "partition");
+
+		if (g_boot && g_part) {
+			char* dev = talloc_asprintf(NULL, "%s%s", g_boot,
+				g_part);
+
+			state->opt->initrd_file = resolve_path(state->opt,
+				value, dev);
+			state->desc_initrd = talloc_asprintf(state,
+				"initrd=%s%s", dev, value);
+			talloc_free(dev);
+		} else if (g_boot) {
+			state->opt->initrd_file = resolve_path(state->opt,
+				value, g_boot);
+			state->desc_initrd = talloc_asprintf(state,
+				"initrd=%s%s", g_boot, value);
+		} else {
+			state->opt->initrd_file = resolve_path(state->opt,
+				value, conf->dc->device_path);
+			state->desc_initrd = talloc_asprintf(state, "initrd=%s",
+				value);
+		}
 		return;
 	}
 
@@ -258,7 +295,7 @@ static int yaboot_parse(struct discover_context *dc)
 	conf = talloc_zero(dc, struct conf_context);
 
 	if (!conf)
-		return -1;
+		return 0;
 
 	conf->dc = dc;
 	conf->global_options = yaboot_global_options,