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

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 811679d..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>
@@ -12,6 +14,8 @@
 #include "paths.h"
 #include "user-event.h"
 
+static const char *pxelinux_prefix = "pxelinux.cfg/";
+
 struct pxe_parser_info {
 	struct discover_boot_option *opt;
 	const char *default_name;
@@ -24,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)
 {
@@ -68,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")) {
@@ -86,7 +128,7 @@ 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);
 		}
 	}
@@ -95,10 +137,11 @@ static void pxe_process_pair(struct conf_context *ctx,
 
 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 pb_url *conf_url, *url;
 	struct conf_context *conf;
+	bool complete_url;
 	int len, rc;
 	char *buf;
 
@@ -119,11 +162,12 @@ static int pxe_parse(struct discover_context *dc)
 	parser_info = talloc_zero(conf, struct pxe_parser_info);
 	conf->parser_info = parser_info;
 
-	conf_url = user_event_parse_conf_url(dc, dc->event);
-	if (!conf_url)
+	dc->conf_url = user_event_parse_conf_url(dc, dc->event, &complete_url);
+	if (!dc->conf_url)
 		goto out_conf;
 
-	if (dc->conf_url) {
+	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;
@@ -134,10 +178,14 @@ static int pxe_parse(struct discover_context *dc)
 
 		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, conf_url, *filename);
+			url = pb_url_join(dc, pxe_base_url, *filename);
 			if (!url)
-				goto out_pxe_conf;
+				continue;
 
 			rc = parser_request_url(dc, url, &buf, &len);
 			if (!rc) /* found one, just break */
@@ -146,13 +194,12 @@ static int pxe_parse(struct discover_context *dc)
 			talloc_free(url);
 		}
 
+		talloc_free(pxe_base_url);
+
 		/* No configuration file found on the boot server */
 		if (rc)
 			goto out_pxe_conf;
 
-		dc->conf_url = url;
-
-		talloc_free(conf_url);
 		talloc_free(pxe_conf_files);
 	}