X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=ba0f81c44518bc2f754c583d35dabf55f2e311f1;hp=d2ebaab0e8a0f07f2f1aeef8bd262762301980b8;hb=fed2c4da36c2708f2a5a7a09eba61d014b9339d6;hpb=47d0601affe80d7f98a2053749f5e1d479f902f4

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index d2ebaab..ba0f81c 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -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;
 	}
 }
 
@@ -258,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()
@@ -273,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) {
@@ -306,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 */
@@ -405,7 +500,7 @@ static int pxe_parse(struct discover_context *dc)
 			file_url = dc->conf_url;
 
 		if (!file_url) {
-			pb_log("%s: Failed to parse conf url!\n", __func__);
+			pb_log_fn("Failed to parse conf url!\n");
 			goto out_conf;
 		}