discover/paths: Add stdout callback parameter for load_url_async()

[petitboot] / discover / pxe-parser.c

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 75d7e7e0b51cdadef245caf5d972a31eaee9696e..b51511a4b7a8dab7b1ff35a5845840af5ba258b9 100644 (file)
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -227,7 +227,8 @@ static void pxe_load_next_filename(struct conf_context *conf)
                if (!url)
                        continue;
 
-               if (load_url_async(conf, url, pxe_conf_parse_cb, conf))
+               if (load_url_async(conf, url, pxe_conf_parse_cb, conf,
+                                  NULL, NULL))
                        break;
        }
 
@@ -250,18 +251,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 +289,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);
 
        /*
@@ -286,7 +297,7 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
         */
        device_handler_status_dev_info(handler, conf->dc->device,
                        _("Parsed PXE config from %s"),
-                       pb_url_to_string(conf->dc->conf_url));
+                       pb_url_to_string(result->url));
 
        talloc_free(buf);
 out_clean:
@@ -370,7 +381,7 @@ static int pxe_parse(struct discover_context *dc)
 
                /* 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);
+                                       pxe_conf_parse_cb, conf, NULL, ctx);
                if (!result) {
                        pb_log("load_url_async fails for %s\n",
                                        dc->conf_url->path);