X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=ba0f81c44518bc2f754c583d35dabf55f2e311f1;hp=aef43b8cdfc06737ad72d06fc7f76a4c1670473f;hb=78c3a044d2302bacf27ac2d9ef179bc35824af4c;hpb=9f191cc3c194ed51534c22e2dae15b2c08c8abc2 diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c index aef43b8..ba0f81c 100644 --- a/discover/pxe-parser.c +++ b/discover/pxe-parser.c @@ -31,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 @@ -148,6 +153,14 @@ static void pxe_process_pair(struct conf_context *ctx, return; } + 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); @@ -246,6 +259,97 @@ static void pxe_load_next_filename(struct conf_context *conf) return; } +/* + * Parse a limited set of iPXE commands. This is handled separately from + * conf_parse_buf() since not all commands will have a value. + */ +static bool ipxe_simple_parser(struct conf_context *ctx, char *buf, int len) +{ + struct discover_boot_option *opt; + char *p, *name, *value; + struct pb_url *url; + + p = strstr(buf, "#!ipxe"); + + /* Only try to parse this if the ipxe header is right at the start */ + if (!p || p != buf) + return false; + p = strchr(buf, '\n') + 1; + + opt = discover_boot_option_create(ctx->dc, ctx->dc->device); + + opt->option->id = talloc_asprintf(opt, "%s@%p", + ctx->dc->device->device->id, opt); + opt->option->type = DISCOVER_BOOT_OPTION; + + while (p && p <= buf + len) { + + p = conf_get_pair(ctx, p, &name, &value, ' ', '\n'); + + /* The 'boot' command appears by itself without options */ + if (!name && value && streq(value, "boot")) { + opt->option->is_default = true; + continue; + } + + /* All other parameters require a value */ + if (!value) { + pb_debug("%s: '%s' missing value\n", __func__, name); + continue; + } + + if (streq(name, "kernel")) { + char *args, *name = NULL, *saveptr = NULL, *tmp; + + /* + * value is of the form: + * boot_image [--name option_name ] [option args ...] + */ + tmp = strtok_r(value, " ", &saveptr); + if (!tmp) { + pb_log("%s: malformed kernel statement\n", __func__); + break; + } + + url = pxe_url_join(ctx->dc, ctx->dc->conf_url, tmp); + opt->boot_image = create_url_resource(opt, url); + + tmp = strtok_r(NULL, " ", &saveptr); + if (!tmp) + continue; + if (streq(tmp, "--name")) { + tmp = strtok_r(NULL, " ", &saveptr); + name = talloc_asprintf(opt, "%s", + tmp ?: "malformed ipxe option"); + args = strtok_r(NULL, " ", &saveptr); + } else + args = tmp; + + while (args) { + pxe_append_string(opt, args); + args = strtok_r(NULL, " ", &saveptr); + } + + opt->option->name = name ?: talloc_asprintf(opt, + "ipxe option (%s)", url->full); + continue; + } + + if (streq(name, "initrd")) { + url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value); + opt->initrd = create_url_resource(opt, url); + continue; + } + } + + if (opt->boot_image) + discover_context_add_boot_option(ctx->dc, opt); + else + pb_debug("ipxe file did not contain a valid option\n"); + + return true; +} + /* * Callback for asynchronous loads from pxe_parse() * @param result Result of load_url_async() @@ -261,12 +365,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) { @@ -294,9 +400,10 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data) * Parse the first successfully downloaded file. We only want to parse * the first because otherwise we could parse options from both a * machine-specific config and a 'fallback' default config + * We also check if the file is in the limited ipxe format. */ - - conf_parse_buf(conf, buf, len); + if (!ipxe_simple_parser(conf, buf, len)) + conf_parse_buf(conf, buf, len); /* We may be called well after the original caller of iterate_parsers(), * commit any new boot options ourselves */ @@ -312,7 +419,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); } @@ -356,7 +463,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); @@ -385,21 +492,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_fn("Failed to parse conf url!\n"); + 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);