discover/grub: Use different paths to search for the BLS directory
[petitboot] / discover / pxe-parser.c
index 7183ecff2dca169251999be12c3f592a441b1bce..470dd83f08ad71590339156ac1bc10c853152532 100644 (file)
@@ -41,6 +41,7 @@ static void pxe_finish(struct conf_context *conf)
                if (info->proxy)
                        info->opt->proxy = talloc_strdup(info->opt, info->proxy);
                discover_context_add_boot_option(conf->dc, info->opt);
+               info->opt = NULL;
        }
 }
 
@@ -273,12 +274,14 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
        if (!data)
                return;
+       if (!result)
+               goto out_clean;
 
        handler = talloc_parent(conf);
 
-       if (result && result->status == LOAD_OK)
+       if (result->status == LOAD_OK)
                rc = read_file(conf, result->local, &buf, &len);
-       if (!result || result->status != LOAD_OK || rc) {
+       if (result->status != LOAD_OK || rc) {
                /* This load failed so try the next available filename */
                info = conf->parser_info;
                if (!info->pxe_conf_files) {
@@ -324,7 +327,7 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
        talloc_free(buf);
 out_clean:
-       if (result->cleanup_local)
+       if (result && result->cleanup_local)
                unlink(result->local);
        talloc_free(conf);
 }
@@ -368,7 +371,7 @@ static struct conf_context *copy_context(void *ctx, struct discover_context *dc)
 
 static int pxe_parse(struct discover_context *dc)
 {
-       struct pb_url *pxe_base_url;
+       struct pb_url *pxe_base_url, *file_url;
        struct conf_context *conf = NULL;
        struct load_url_result *result;
        void *ctx = talloc_parent(dc);
@@ -397,21 +400,30 @@ static int pxe_parse(struct discover_context *dc)
                return -1;
 
        if (complete_url) {
+               /* Check if this file has already been downloaded */
+               if (event_get_param(dc->event, "pxeconffile-local"))
+                       file_url = pb_url_parse(dc, event_get_param(dc->event,
+                                               "pxeconffile-local"));
+               else
+                       file_url = dc->conf_url;
+
+               if (!file_url) {
+                       pb_log("%s: Failed to parse conf url!\n", __func__);
+                       goto out_conf;
+               }
+
                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,
+               result = load_url_async(conf->dc, file_url,
                                        pxe_conf_parse_cb, conf, NULL, ctx);
                if (!result) {
                        pb_log("load_url_async fails for %s\n",
                                        dc->conf_url->path);
                        goto out_conf;
-               } else if (result->status == LOAD_OK) {
-                       /* Local load - call pxe_conf_parse_cb() now */
-                       pxe_conf_parse_cb(result, conf);
                }
        } else {
                pxe_conf_files = user_event_parse_conf_filenames(dc, dc->event);