X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=98e160373a90f25c68fe22434d60d84ee9dfda19;hp=368d5c7a9e2ba81e56179241218dc525ec50a4e8;hb=a1fb38f17bfa60aac89d0dd21dd8ccc739d794bf;hpb=402884d9d5835879f3c75657a46492cc03261255

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 368d5c7..98e1603 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -1,5 +1,7 @@
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 #include <string.h>
 
 #include <talloc/talloc.h>
@@ -9,6 +11,10 @@
 #include "parser-conf.h"
 #include "parser-utils.h"
 #include "resource.h"
+#include "paths.h"
+#include "user-event.h"
+
+static const char *pxelinux_prefix = "pxelinux.cfg/";
 
 struct pxe_parser_info {
 	struct discover_boot_option *opt;
@@ -22,6 +28,44 @@ static void pxe_finish(struct conf_context *conf)
 		discover_context_add_boot_option(conf->dc, info->opt);
 }
 
+/* We need a slightly modified version of pb_url_join, to allow for the
+ * pxelinux "::filename" syntax for absolute URLs
+ */
+static struct pb_url *pxe_url_join(void *ctx, const struct pb_url *url,
+		const char *s)
+{
+	struct pb_url *new_url;
+	int len;
+
+	len = strlen(s);
+
+	if (len > 2 && s[0] == ':' && s[1] == ':') {
+		char *tmp;
+
+		if (s[2] == '/') {
+			/* ::/path -> /path */
+			tmp = talloc_strdup(ctx, s+2);
+		} else {
+			/* ::path -> /path */
+			tmp = talloc_strdup(ctx, s+1);
+			tmp[0] = '/';
+		}
+
+		new_url = pb_url_join(ctx, url, tmp);
+
+		talloc_free(tmp);
+
+	} else {
+		const char *tmp;
+		/* strip leading slashes */
+		for (tmp = s; *tmp == '/'; tmp++);
+			;
+		new_url = pb_url_join(ctx, url, tmp);
+	}
+
+	return new_url;
+}
+
 static void pxe_process_pair(struct conf_context *ctx,
 		const char *name, char *value)
 {
@@ -66,11 +110,11 @@ static void pxe_process_pair(struct conf_context *ctx,
 		return;
 
 	if (streq(name, "KERNEL")) {
-		url = pb_url_join(ctx->dc, ctx->dc->conf_url, value);
+		url = pxe_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);
+		url = pxe_url_join(ctx->dc, ctx->dc->conf_url, value);
 		opt->initrd = create_url_resource(opt, url);
 
 	} else if (streq(name, "APPEND")) {
@@ -84,22 +128,31 @@ static void pxe_process_pair(struct conf_context *ctx,
 			end = strchrnul(str, ' ');
 			*end = '\0';
 
-			url = pb_url_join(ctx->dc, ctx->dc->conf_url, str);
+			url = pxe_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)
+static int pxe_parse(struct discover_context *dc)
 {
+	struct pb_url *pxe_base_url, *url;
 	struct pxe_parser_info *parser_info;
+	char **pxe_conf_files, **filename;
 	struct conf_context *conf;
+	bool complete_url;
+	int len, rc;
+	char *buf;
+
+	/* Expects dhcp event parameters to support network boot */
+	if (!dc->event)
+		return -1;
 
 	conf = talloc_zero(dc, struct conf_context);
 
 	if (!conf)
-		return 0;
+		goto out;
 
 	conf->dc = dc;
 	conf->get_pair = conf_get_pair_space;
@@ -109,16 +162,66 @@ static int pxe_parse(struct discover_context *dc, char *buf, int len)
 	parser_info = talloc_zero(conf, struct pxe_parser_info);
 	conf->parser_info = parser_info;
 
+	dc->conf_url = user_event_parse_conf_url(dc, dc->event, &complete_url);
+	if (!dc->conf_url)
+		goto out_conf;
+
+	if (complete_url) {
+		/* we have a complete URL; use this and we're done. */
+		rc = parser_request_url(dc, dc->conf_url, &buf, &len);
+		if (rc)
+			goto out_conf;
+	} else {
+		pxe_conf_files = user_event_parse_conf_filenames(dc, dc->event);
+		if (!pxe_conf_files)
+			goto out_conf;
+
+		rc = -1;
+
+		pxe_base_url = pb_url_join(dc, dc->conf_url, pxelinux_prefix);
+		if (!pxe_base_url)
+			goto out_pxe_conf;
+
+		for (filename = pxe_conf_files; *filename; filename++) {
+			url = pb_url_join(dc, pxe_base_url, *filename);
+			if (!url)
+				continue;
+
+			rc = parser_request_url(dc, url, &buf, &len);
+			if (!rc) /* found one, just break */
+				break;
+
+			talloc_free(url);
+		}
+
+		talloc_free(pxe_base_url);
+
+		/* No configuration file found on the boot server */
+		if (rc)
+			goto out_pxe_conf;
+
+		talloc_free(pxe_conf_files);
+	}
+
+	/* Call the config file parser with the data read from the file */
 	conf_parse_buf(conf, buf, len);
 
+	talloc_free(buf);
+	talloc_free(conf);
+
+	return 0;
+
+out_pxe_conf:
+	talloc_free(pxe_conf_files);
+out_conf:
 	talloc_free(conf);
-	return 1;
+out:
+	return -1;
 }
 
 static struct parser pxe_parser = {
 	.name			= "pxe",
 	.parse			= pxe_parse,
-	.method			= CONF_METHOD_DHCP,
 };
 
 register_parser(pxe_parser);