From 93065a40773611096f2b1e095563ae21c5056c93 Mon Sep 17 00:00:00 2001
From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Mon, 27 Aug 2018 14:34:57 +1000
Subject: 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>
---
 test/parser/Makefile.am          |  1 +
 test/parser/test-kboot-default.c | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 test/parser/test-kboot-default.c

(limited to 'test/parser')

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);
+}
-- 
cgit v1.2.1