discover/pxe: Implement default options

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index ca0f4b543ef09a6bbc9e4a4eb0db0680e8d96154..368d5c7a9e2ba81e56179241218dc525ec50a4e8 100644 (file)
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -10,16 +10,23 @@
 #include "parser-utils.h"
 #include "resource.h"
 
 #include "parser-utils.h"
 #include "resource.h"
 

+struct pxe_parser_info {
+       struct discover_boot_option *opt;
+       const char *default_name;
+};
+

 static void pxe_finish(struct conf_context *conf)
 {
 static void pxe_finish(struct conf_context *conf)
 {

-       if (conf->parser_info)
-               discover_context_add_boot_option(conf->dc, conf->parser_info);
+       struct pxe_parser_info *info = conf->parser_info;
+       if (info->opt)
+               discover_context_add_boot_option(conf->dc, info->opt);

 }
 
 static void pxe_process_pair(struct conf_context *ctx,
                const char *name, char *value)
 {
 }
 
 static void pxe_process_pair(struct conf_context *ctx,
                const char *name, char *value)
 {

-       struct discover_boot_option *opt = ctx->parser_info;
+       struct pxe_parser_info *parser_info = ctx->parser_info;
+       struct discover_boot_option *opt = parser_info->opt;

        struct pb_url *url;
 
        /* quirk in the syslinux config format: initrd can be separated
        struct pb_url *url;
 
        /* quirk in the syslinux config format: initrd can be separated


@@ -32,16 +39,25 @@ static void pxe_process_pair(struct conf_context *ctx,
        if (!name)
                return;
 
        if (!name)
                return;
 

+       if (streq(name, "DEFAULT")) {
+               parser_info->default_name = talloc_strdup(parser_info, value);
+               return;
+       }
+

        if (streq(name, "LABEL")) {
                if (opt)
                        pxe_finish(ctx);
 
                opt = discover_boot_option_create(ctx->dc, ctx->dc->device);
        if (streq(name, "LABEL")) {
                if (opt)
                        pxe_finish(ctx);
 
                opt = discover_boot_option_create(ctx->dc, ctx->dc->device);

-               ctx->parser_info = opt;

 
                opt->option->name = talloc_strdup(opt, value);
                opt->option->id = talloc_asprintf(opt, "%s@%p",
                                ctx->dc->device->device->id, opt);
 
                opt->option->name = talloc_strdup(opt, value);
                opt->option->id = talloc_asprintf(opt, "%s@%p",
                                ctx->dc->device->device->id, opt);

+
+               opt->option->is_default = parser_info->default_name &&
+                                       streq(parser_info->default_name, value);
+
+               parser_info->opt = opt;

                return;
        }
 
                return;
        }
 


@@ -77,6 +93,7 @@ static void pxe_process_pair(struct conf_context *ctx,
 
 static int pxe_parse(struct discover_context *dc, char *buf, int len)
 {
 
 static int pxe_parse(struct discover_context *dc, char *buf, int len)
 {

+       struct pxe_parser_info *parser_info;

        struct conf_context *conf;
 
        conf = talloc_zero(dc, struct conf_context);
        struct conf_context *conf;
 
        conf = talloc_zero(dc, struct conf_context);


@@ -89,6 +106,9 @@ static int pxe_parse(struct discover_context *dc, char *buf, int len)
        conf->process_pair = pxe_process_pair;
        conf->finish = pxe_finish;
 
        conf->process_pair = pxe_process_pair;
        conf->finish = pxe_finish;
 

+       parser_info = talloc_zero(conf, struct pxe_parser_info);
+       conf->parser_info = parser_info;
+

        conf_parse_buf(conf, buf, len);
 
        talloc_free(conf);
        conf_parse_buf(conf, buf, len);
 
        talloc_free(conf);

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index e221bf2080c1918084ad92e59ec77badc980be5f..a46388c165338f16549d51033cf6203cf758bec9 100644 (file)
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -43,7 +43,8 @@ TESTS = \
        test-yaboot-rh8-ppc64 \
        test-pxe-empty \
        test-pxe-single \
        test-yaboot-rh8-ppc64 \
        test-pxe-empty \
        test-pxe-single \

-       test-pxe-initrd-in-append
+       test-pxe-initrd-in-append \
+       test-pxe-default

 
 $(TESTS): %: %.embedded-config.o
 $(TESTS): LDADD += $@.embedded-config.o
 
 $(TESTS): %: %.embedded-config.o
 $(TESTS): LDADD += $@.embedded-config.o