X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=inline;f=discover%2Fpxe-parser.c;h=75d7e7e0b51cdadef245caf5d972a31eaee9696e;hb=f00b8c2d08e4ef57f2da0ed3b1701ed50331b91d;hp=a0442152c0c949849b4de7a4d54b944520c0ed9c;hpb=c5ae6f4846ca4bd8e13ffa08a293950433f3096c;p=petitboot

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index a044215..75d7e7e 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);
@@ -241,7 +243,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;
@@ -279,14 +280,13 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 	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_status(handler, &status);
+	device_handler_status_dev_info(handler, conf->dc->device,
+			_("Parsed PXE config from %s"),
+			pb_url_to_string(conf->dc->conf_url));
 
 	talloc_free(buf);
 out_clean:
@@ -363,6 +363,11 @@ 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);
@@ -384,6 +389,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);
 	}