From a744f086e4c16d5b286cf264a16ceca2dc23d43e Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 25 Aug 2014 15:49:29 +0800
Subject: [PATCH] discover: Implement PXE SYSAPPEND syntax

This change implements SYSAPPEND/IPAPPEND 2, to add a BOOTIF argument to
the kernel command line.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 discover/pxe-parser.c           | 48 ++++++++++++++++++++++++++++++++-
 test/parser/Makefile.am         |  1 +
 test/parser/test-pxe-ipappend.c | 35 ++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 test/parser/test-pxe-ipappend.c

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 00f3b31..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/";
@@ -66,6 +69,42 @@ static struct pb_url *pxe_url_join(void *ctx, const struct pb_url *url,
 	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)
 {
@@ -120,7 +159,7 @@ static void pxe_process_pair(struct conf_context *ctx,
 	} 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) {
@@ -131,6 +170,13 @@ static void pxe_process_pair(struct conf_context *ctx,
 			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);
 	}
 
 }
diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 95ee002..d24e720 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -50,6 +50,7 @@ parser_TESTS = \
 	test/parser/test-pxe-ip-without-conf \
 	test/parser/test-pxe-non-url-conf \
 	test/parser/test-pxe-local \
+	test/parser/test-pxe-ipappend \
 	test/parser/test-pxe-pathprefix-with-conf \
 	test/parser/test-pxe-non-url-pathprefix-with-conf \
 	test/parser/test-pxe-pathprefix-discover \
diff --git a/test/parser/test-pxe-ipappend.c b/test/parser/test-pxe-ipappend.c
new file mode 100644
index 0000000..4719b5c
--- /dev/null
+++ b/test/parser/test-pxe-ipappend.c
@@ -0,0 +1,35 @@
+
+#include "parser-test.h"
+
+#if 0 /* PARSER_EMBEDDED_CONFIG */
+default linux
+
+label linux
+kernel ./pxe/de-ad-de-ad-be-ef.vmlinuz
+append command line
+ipappend 2
+#endif
+
+void run_test(struct parser_test *test)
+{
+	struct discover_boot_option *opt;
+	struct discover_context *ctx;
+
+	test_read_conf_embedded_url(test, "tftp://host/dir/conf.txt");
+
+	test_set_event_source(test);
+	test_set_event_param(test->ctx->event, "pxeconffile",
+			"tftp://host/dir/conf.txt");
+	test_set_event_param(test->ctx->event, "mac",
+			"01:02:03:04:05:06");
+
+	test_run_parser(test, "pxe");
+
+	ctx = test->ctx;
+
+	check_boot_option_count(ctx, 1);
+	opt = get_boot_option(ctx, 0);
+
+	check_name(opt, "linux");
+	check_args(opt, "command line BOOTIF=01:02:03:04:05:06");
+}
-- 
2.39.2