[16/29] discover/status: report on PXE download failures
diff mbox

Message ID 20161219041915.30497-17-sam@mendozajonas.com
State Accepted
Headers show

Commit Message

Samuel Mendoza-Jonas Dec. 19, 2016, 4:19 a.m. UTC
From: Jeremy Kerr <jk@ozlabs.org>

Add dev_err messages on both autoconfiguration and
specified-configuration download failures.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---
 discover/pxe-parser.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Patch
diff mbox

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 5aacd39..90af66b 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -250,18 +250,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;
@@ -277,7 +288,6 @@  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);
 
 	/*