X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=0456f5b90645b08cd8cc5a4499ec05ba219626df;hp=17ae55e6a3dc0c5665be7e7678a308dddf6ecf0d;hb=8fa3f3bd22e66329ac0dd65a82bf8eb554e2364d;hpb=30dce4ce0447802e3b54b3f760c5fd8eacbe75ff

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 17ae55e..0456f5b 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -2,16 +2,19 @@
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
 #endif
+#include <stdlib.h>
 #include <string.h>
 
 #include <talloc/talloc.h>
 #include <url/url.h>
+#include <log/log.h>
 
 #include "parser.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
 #include "resource.h"
 #include "paths.h"
+#include "event.h"
 #include "user-event.h"
 
 static const char *pxelinux_prefix = "pxelinux.cfg/";
@@ -28,6 +31,80 @@ 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_append_string(struct discover_boot_option *opt,
+		const char *str)
+{
+	if (opt->option->boot_args)
+		opt->option->boot_args = talloc_asprintf_append(
+				opt->option->boot_args, " %s", str);
+	else
+		opt->option->boot_args = talloc_strdup(opt->option, str);
+}
+
+static void pxe_process_sysappend(struct discover_context *ctx,
+		struct discover_boot_option *opt,
+		unsigned long val)
+{
+	struct event *event = ctx->event;
+	char *str = NULL;
+
+	if (!event)
+		return;
+
+	if (val & 0x2) {
+		const char *mac = event_get_param(event, "mac");
+		if (mac) {
+			str = talloc_asprintf(ctx, "BOOTIF=%s", mac);
+			pxe_append_string(opt, str);
+			talloc_free(str);
+		}
+		val &= ~0x2;
+	}
+
+	if (val)
+		pb_log("pxe: unsupported features requested in "
+				"ipappend/sysappend: 0x%04lx", val);
+
+}
+
 static void pxe_process_pair(struct conf_context *ctx,
 		const char *name, char *value)
 {
@@ -72,17 +149,17 @@ 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")) {
 		char *str, *end;
 
-		opt->option->boot_args = talloc_strdup(opt->option, value);
+		pxe_append_string(opt, value);
 
 		str = strcasestr(value, "INITRD=");
 		if (str) {
@@ -90,9 +167,16 @@ 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);
 		}
+	} else if (streq(name, "SYSAPPEND") || streq(name, "IPAPPEND")) {
+		unsigned long type;
+		char *end;
+
+		type = strtoul(value, &end, 10);
+		if (end != value && !(*end))
+			pxe_process_sysappend(ctx->dc, opt, type);
 	}
 
 }