summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2016-12-12 20:10:43 +0800
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2016-12-20 16:40:21 +1100
commitf00b8c2d08e4ef57f2da0ed3b1701ed50331b91d (patch)
tree8756de8e1a0015ab70054881c0bce22f65235d30
parent789ba5f256f2b9f98d3eaad8c39c894c8e8c86f6 (diff)
downloadpetitboot-f00b8c2d08e4ef57f2da0ed3b1701ed50331b91d.zip
petitboot-f00b8c2d08e4ef57f2da0ed3b1701ed50331b91d.tar.gz
discover/status: report attempts at PXE configuration download
Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--discover/pxe-parser.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index cd5f149..75d7e7e 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -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);
}
OpenPOWER on IntegriCloud