X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=470dd83f08ad71590339156ac1bc10c853152532;hp=5ac6990a876ecb9bc1873648e7601416ae40a7a7;hb=6d06f0dbe1195cd8be7d3c54d02012ff16466d0c;hpb=b5f9e34d85075afe7aa87b5ce4a1a2d911468e36 diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c index 5ac6990..470dd83 100644 --- a/discover/pxe-parser.c +++ b/discover/pxe-parser.c @@ -11,6 +11,7 @@ #include #include +#include "device-handler.h" #include "parser.h" #include "parser-conf.h" #include "parser-utils.h" @@ -30,13 +31,18 @@ struct pxe_parser_info { char **pxe_conf_files; struct pb_url *pxe_base_url; int current; + char *proxy; }; static void pxe_finish(struct conf_context *conf) { struct pxe_parser_info *info = conf->parser_info; - if (info->opt) + if (info->opt) { + if (info->proxy) + info->opt->proxy = talloc_strdup(info->opt, info->proxy); discover_context_add_boot_option(conf->dc, info->opt); + info->opt = NULL; + } } /* We need a slightly modified version of pb_url_join, to allow for the @@ -108,8 +114,9 @@ static void pxe_process_sysappend(struct discover_context *ctx, return; if (val & 0x2) { - uint8_t *mac = find_mac_by_name(ctx, ctx->network, - event->device); + uint8_t *mac = find_mac_by_name(ctx, + device_handler_get_network(ctx->handler), + event->device); str = pxe_sysappend_mac(ctx, mac); if (str) { pxe_append_string(opt, str); @@ -146,7 +153,15 @@ static void pxe_process_pair(struct conf_context *ctx, return; } - if (streq(name, "LABEL")) { + if (streq(name, "PROXY")) { + if (parser_info->proxy) + talloc_free(parser_info->proxy); + + parser_info->proxy = talloc_strdup(parser_info, value); + return; + } + + if (streq(name, "LABEL") || streq(name, "PLUGIN")) { if (opt) pxe_finish(ctx); @@ -156,8 +171,12 @@ static void pxe_process_pair(struct conf_context *ctx, opt->option->id = talloc_asprintf(opt, "%s@%p", ctx->dc->device->device->id, opt); - opt->option->is_default = parser_info->default_name && - streq(parser_info->default_name, value); + if (streq(name, "LABEL")) { + opt->option->type = DISCOVER_BOOT_OPTION; + opt->option->is_default = parser_info->default_name && + streq(parser_info->default_name, value); + } else + opt->option->type = DISCOVER_PLUGIN_OPTION; parser_info->opt = opt; return; @@ -167,6 +186,14 @@ static void pxe_process_pair(struct conf_context *ctx, if (!opt) return; + if (streq(name, "TARBALL") && + opt->option->type == DISCOVER_PLUGIN_OPTION) { + url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value); + opt->boot_image = create_url_resource(opt, url); + /* All other options apply to boot options only */ + return; + } + if (streq(name, "KERNEL")) { url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value); opt->boot_image = create_url_resource(opt, url); @@ -208,7 +235,6 @@ static void pxe_process_pair(struct conf_context *ctx, url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value); opt->dtb = create_url_resource(opt, url); } - } static void pxe_load_next_filename(struct conf_context *conf) @@ -225,7 +251,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; } @@ -247,19 +274,32 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data) if (!data) return; + if (!result) + goto out_clean; - if (result && result->status == LOAD_OK) + handler = talloc_parent(conf); + + 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) + 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; @@ -275,19 +315,19 @@ 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); /* - * 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_info(handler, _("pxe: parsed config for %s"), - conf->dc->conf_url->host); + device_handler_status_dev_info(handler, conf->dc->device, + _("Parsed PXE config from %s"), + pb_url_to_string(result->url)); talloc_free(buf); out_clean: - if (result->cleanup_local) + if (result && result->cleanup_local) unlink(result->local); talloc_free(conf); } @@ -331,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); @@ -360,9 +400,26 @@ 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, - pxe_conf_parse_cb, conf); + 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); @@ -381,6 +438,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); }