X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=inline;f=discover%2Fpxe-parser.c;h=5c80b1399973813f47db0f705fb4a3d0fba41ebd;hb=d63bacef37d61b46e8db10914d4a7a677ba0775a;hp=7183ecff2dca169251999be12c3f592a441b1bce;hpb=3a76e4214d5ca666e1d2d6c74e84309064c8a3ab;p=petitboot

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 7183ecf..5c80b13 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -368,7 +368,7 @@ static struct conf_context *copy_context(void *ctx, struct discover_context *dc)
 
 static int pxe_parse(struct discover_context *dc)
 {
-	struct pb_url *pxe_base_url;
+	struct pb_url *pxe_base_url, *file_url;
 	struct conf_context *conf = NULL;
 	struct load_url_result *result;
 	void *ctx = talloc_parent(dc);
@@ -397,21 +397,30 @@ static int pxe_parse(struct discover_context *dc)
 		return -1;
 
 	if (complete_url) {
+		/* Check if this file has already been downloaded */
+		if (event_get_param(dc->event, "pxeconffile-local"))
+			file_url = pb_url_parse(dc, event_get_param(dc->event,
+						"pxeconffile-local"));
+		else
+			file_url = dc->conf_url;
+
+		if (!file_url) {
+			pb_log("%s: Failed to parse conf url!\n", __func__);
+			goto out_conf;
+		}
+
 		device_handler_status_dev_info(conf->dc->handler,
 			dc->device,
 			_("Requesting config %s"),
 			pb_url_to_string(conf->dc->conf_url));
 
 		/* we have a complete URL; use this and we're done. */
-		result = load_url_async(conf->dc, conf->dc->conf_url,
+		result = load_url_async(conf->dc, file_url,
 					pxe_conf_parse_cb, conf, NULL, ctx);
 		if (!result) {
 			pb_log("load_url_async fails for %s\n",
 					dc->conf_url->path);
 			goto out_conf;
-		} else if (result->status == LOAD_OK) {
-			/* Local load - call pxe_conf_parse_cb() now */
-			pxe_conf_parse_cb(result, conf);
 		}
 	} else {
 		pxe_conf_files = user_event_parse_conf_filenames(dc, dc->event);