discover/status: report attempts at PXE configuration download
authorJeremy Kerr <jk@ozlabs.org>
Mon, 12 Dec 2016 12:10:43 +0000 (20:10 +0800)
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>
Tue, 20 Dec 2016 05:40:21 +0000 (16:40 +1100)
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
discover/pxe-parser.c

index cd5f1495343117cef6e6f207398384379ca5a1e5..75d7e7e0b51cdadef245caf5d972a31eaee9696e 100644 (file)
@@ -281,12 +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_dev_info(handler, conf->dc->device,
                        _("Parsed PXE config from %s"),
-                       conf->dc->conf_url->host);
+                       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);
        }