X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=368d5c7a9e2ba81e56179241218dc525ec50a4e8;hp=662716ac075cfe6fe73e6085de986bc08ec1b924;hb=7889b6f4bf81a1d2742c6f7d6fb9f6f603dd251e;hpb=a51e41eb1d2545b7eb03ff02604225b9594b11e7

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 662716a..368d5c7 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -1,4 +1,5 @@
 
+#define _GNU_SOURCE
 #include <string.h>
 
 #include <talloc/talloc.h>
@@ -9,29 +10,54 @@
 #include "parser-utils.h"
 #include "resource.h"
 
+struct pxe_parser_info {
+	struct discover_boot_option *opt;
+	const char *default_name;
+};
+
 static void pxe_finish(struct conf_context *conf)
 {
-	printf("%s\n", __func__);
-	discover_context_add_boot_option(conf->dc, conf->parser_info);
+	struct pxe_parser_info *info = conf->parser_info;
+	if (info->opt)
+		discover_context_add_boot_option(conf->dc, info->opt);
 }
 
 static void pxe_process_pair(struct conf_context *ctx,
 		const char *name, char *value)
 {
-	struct discover_boot_option *opt = ctx->parser_info;
+	struct pxe_parser_info *parser_info = ctx->parser_info;
+	struct discover_boot_option *opt = parser_info->opt;
 	struct pb_url *url;
 
+	/* quirk in the syslinux config format: initrd can be separated
+	 * by an '=' */
+	if (!name && !strncasecmp(value, "initrd=", strlen("initrd="))) {
+		name = "initrd";
+		value += strlen("initrd=");
+	}
+
+	if (!name)
+		return;
+
+	if (streq(name, "DEFAULT")) {
+		parser_info->default_name = talloc_strdup(parser_info, value);
+		return;
+	}
+
 	if (streq(name, "LABEL")) {
 		if (opt)
 			pxe_finish(ctx);
 
 		opt = discover_boot_option_create(ctx->dc, ctx->dc->device);
-		ctx->parser_info = opt;
 
-		opt->option->device_id = ctx->dc->device->device->id;
 		opt->option->name = talloc_strdup(opt, value);
 		opt->option->id = talloc_asprintf(opt, "%s@%p",
-				opt->option->device_id, opt);
+				ctx->dc->device->device->id, opt);
+
+		opt->option->is_default = parser_info->default_name &&
+					streq(parser_info->default_name, value);
+
+		parser_info->opt = opt;
 		return;
 	}
 
@@ -43,14 +69,31 @@ static void pxe_process_pair(struct conf_context *ctx,
 		url = pb_url_join(ctx->dc, ctx->dc->conf_url, value);
 		opt->boot_image = create_url_resource(opt, url);
 
+	} else if (streq(name, "INITRD")) {
+		url = pb_url_join(ctx->dc, ctx->dc->conf_url, value);
+		opt->initrd = create_url_resource(opt, url);
+
 	} else if (streq(name, "APPEND")) {
+		char *str, *end;
+
 		opt->option->boot_args = talloc_strdup(opt->option, value);
-		/* todo: initrd extraction */
+
+		str = strcasestr(value, "INITRD=");
+		if (str) {
+			str += strlen("INITRD=");
+			end = strchrnul(str, ' ');
+			*end = '\0';
+
+			url = pb_url_join(ctx->dc, ctx->dc->conf_url, str);
+			opt->initrd = create_url_resource(opt, url);
+		}
 	}
+
 }
 
 static int pxe_parse(struct discover_context *dc, char *buf, int len)
 {
+	struct pxe_parser_info *parser_info;
 	struct conf_context *conf;
 
 	conf = talloc_zero(dc, struct conf_context);
@@ -63,6 +106,9 @@ static int pxe_parse(struct discover_context *dc, char *buf, int len)
 	conf->process_pair = pxe_process_pair;
 	conf->finish = pxe_finish;
 
+	parser_info = talloc_zero(conf, struct pxe_parser_info);
+	conf->parser_info = parser_info;
+
 	conf_parse_buf(conf, buf, len);
 
 	talloc_free(conf);