X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=ff867229e5fa9b32c238509a9f89dea9cb32ba53;hp=221fc30592feec0532f2c0eb0be72b573157c770;hb=6704a228c6389607f775bbaf2ee7de786d7b9996;hpb=4b06a4645e19830581505a675075773adc0857c2

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 221fc30..ff86722 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -11,6 +11,7 @@
 #include <file/file.h>
 #include <i18n/i18n.h>
 
+#include "device-handler.h"
 #include "parser.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
@@ -108,8 +109,9 @@ static void pxe_process_sysappend(struct discover_context *ctx,
 		return;
 
 	if (val & 0x2) {
-		uint8_t *mac = find_mac_by_name(ctx, ctx->network,
-					event->device);
+		uint8_t *mac = find_mac_by_name(ctx,
+				device_handler_get_network(ctx->handler),
+				event->device);
 		str = pxe_sysappend_mac(ctx, mac);
 		if (str) {
 			pxe_append_string(opt, str);
@@ -225,7 +227,8 @@ static void pxe_load_next_filename(struct conf_context *conf)
 		if (!url)
 			continue;
 
-		if (load_url_async(conf, url, pxe_conf_parse_cb, conf))
+		if (load_url_async(conf, url, pxe_conf_parse_cb, conf,
+				   NULL, NULL))
 			break;
 	}
 
@@ -241,7 +244,6 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 {
 	struct conf_context *conf = data;
 	struct device_handler *handler;
-	struct status status = {0};
 	struct pxe_parser_info *info;
 	char *buf = NULL;
 	int len, rc = 0;
@@ -249,18 +251,29 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 	if (!data)
 		return;
 
+	handler = talloc_parent(conf);
+
 	if (result && result->status == LOAD_OK)
 		rc = read_file(conf, result->local, &buf, &len);
 	if (!result || result->status != LOAD_OK || rc) {
 		/* This load failed so try the next available filename */
 		info = conf->parser_info;
-		if (!info->pxe_conf_files)
+		if (!info->pxe_conf_files) {
+			device_handler_status_dev_err(handler,
+					conf->dc->device,
+					_("Failed to download %s"),
+					pb_url_to_string(result->url));
+
 			return;
+		}
 
 		info->current++;
 		pxe_load_next_filename(conf);
 		if (info->pxe_conf_files[info->current] == NULL) {
 			/* Nothing left to try */
+			device_handler_status_dev_err(handler,
+					conf->dc->device,
+					_("PXE autoconfiguration failed"));
 			goto out_clean;
 		}
 		return;
@@ -276,17 +289,15 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
 	/* We may be called well after the original caller of iterate_parsers(),
 	 * commit any new boot options ourselves */
-	handler = talloc_parent(conf);
 	device_handler_discover_context_commit(handler, conf->dc);
 
-	status.type = STATUS_INFO;
 	/*
-	 * TRANSLATORS: the format specifier in this string in an IP address,
-	 * eg. 192.168.1.1
+	 * TRANSLATORS: the format specifier in this string is a URL
+	 * eg. tftp://192.168.1.1/pxelinux.cfg
 	 */
-	status.message = talloc_asprintf(conf, _("pxe: parsed config for %s"),
-					conf->dc->conf_url->host);
-	device_handler_boot_status(handler, &status);
+	device_handler_status_dev_info(handler, conf->dc->device,
+			_("Parsed PXE config from %s"),
+			pb_url_to_string(result->url));
 
 	talloc_free(buf);
 out_clean:
@@ -363,13 +374,21 @@ static int pxe_parse(struct discover_context *dc)
 		return -1;
 
 	if (complete_url) {
+		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,
-					pxe_conf_parse_cb, conf);
+					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);
@@ -384,6 +403,11 @@ static int pxe_parse(struct discover_context *dc)
 		info->pxe_conf_files = pxe_conf_files;
 		info->pxe_base_url = pxe_base_url;
 
+		device_handler_status_dev_info(conf->dc->handler,
+			conf->dc->device,
+			_("Probing from base %s"),
+			pb_url_to_string(pxe_base_url));
+
 		pxe_load_next_filename(conf);
 	}