From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Mon, 27 Aug 2018 04:34:57 +0000 (+1000)
Subject: discover/kboot-parser: Recognise 'default' parameter
X-Git-Tag: v1.9.1
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=refs%2Ftags%2Fv1.9.1;hp=3917e88b838001b13a19fc6ea01d08b08c0770ca

discover/kboot-parser: Recognise 'default' parameter

The kboot parser doesn't set a default option. Change it so that if we
see the 'default' parameter we match against this value when deciding if
an option should be set as default.

For example:

	default=linux
	linux='/vmlinux initrd=/initrd arg1=value1 arg2'

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index e4b36b6..4c68cd4 100644
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -126,6 +126,10 @@ out_add:
 				" dtb=%s", dtb);
 	}
 
+	if (conf_get_global_option(conf, "default"))
+		opt->is_default = streq(opt->name,
+				conf_get_global_option(conf, "default"));
+
 	conf_strip_str(opt->boot_args);
 	conf_strip_str(opt->description);
 
@@ -137,6 +141,7 @@ static struct conf_global_option kboot_global_options[] = {
 	{ .name = "initrd" },
 	{ .name = "root" },
 	{ .name = "video" },
+	{ .name = "default" },
 	{ .name = NULL }
 };
 
@@ -157,7 +162,6 @@ static const char *const kboot_conf_files[] = {
 };
 
 static const char *const kboot_ignored_names[] = {
-	"default",
 	"delay",
 	"message",
 	"timeout",
diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 1732158..363933e 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -47,6 +47,7 @@ parser_TESTS = \
 	test/parser/test-grub2-blscfg-opts-config \
 	test/parser/test-grub2-blscfg-opts-grubenv \
 	test/parser/test-kboot-single \
+	test/parser/test-kboot-default \
 	test/parser/test-yaboot-empty \
 	test/parser/test-yaboot-single \
 	test/parser/test-yaboot-partition \
diff --git a/test/parser/test-kboot-default.c b/test/parser/test-kboot-default.c
new file mode 100644
index 0000000..a921f63
--- /dev/null
+++ b/test/parser/test-kboot-default.c
@@ -0,0 +1,30 @@
+
+#include "parser-test.h"
+
+static const char config[] =
+	"default=linux\n"
+	"linux='/vmlinux initrd=/initrd arg1=value1 arg2'\n"
+	"hdd='/vmlinux initrd=/initrd'\n";
+
+void run_test(struct parser_test *test)
+{
+	struct discover_boot_option *opt;
+	struct discover_context *ctx;
+
+	test_read_conf_data(test, "/kboot.conf", config);
+
+	test_run_parser(test, "kboot");
+
+	ctx = test->ctx;
+
+	check_boot_option_count(ctx, 2);
+	opt = get_boot_option(ctx, 0);
+
+	check_name(opt, "linux");
+	check_resolved_local_resource(opt->boot_image, ctx->device, "/vmlinux");
+	check_resolved_local_resource(opt->initrd, ctx->device, "/initrd");
+
+	check_args(opt, "arg1=value1 arg2");
+
+	check_is_default(opt);
+}