discover/status: report attempts at PXE configuration download

[petitboot] / discover / pxe-parser.c

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 5ac6990a876ecb9bc1873648e7601416ae40a7a7..75d7e7e0b51cdadef245caf5d972a31eaee9696e 100644 (file)
--- 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);
@@ -279,11 +281,12 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
        device_handler_discover_context_commit(handler, conf->dc);
 
        /*
-        * 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
         */
-       device_handler_status_info(handler, _("pxe: parsed config for %s"),
-                                       conf->dc->conf_url->host);
+       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:
@@ -360,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);
@@ -381,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);
        }