discover: remove (unused) duplicate struct mount_map

[petitboot] / discover / kboot-parser.c

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index 025f13b6afa1bd8e32606da013f6dc2a15f4f667..29324cb224f3ac7ad454131b55803b4f75e796b1 100644 (file)
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -21,7 +21,7 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
        const char *root;
        struct boot_option *opt;
 
        const char *root;
        struct boot_option *opt;
 

-       /* fixup for bare values */
+       /* ignore bare values */

 
        if (!name)
                return;
 
        if (!name)
                return;


@@ -57,7 +57,7 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
        for (pos++; pos;) {
                char *cl_name, *cl_value;
 
        for (pos++; pos;) {
                char *cl_name, *cl_value;
 

-               pos = conf_get_param_pair(pos, &cl_name, &cl_value, ' ');
+               pos = conf_get_pair_equal(conf, pos, &cl_name, &cl_value, ' ');

 
                if (!cl_name) {
                        args = talloc_asprintf_append(args, "%s ", cl_value);
 
                if (!cl_name) {
                        args = talloc_asprintf_append(args, "%s ", cl_value);


@@ -144,6 +144,7 @@ static int kboot_parse(struct discover_context *dc)
        conf->global_options = kboot_global_options,
        conf_init_global_options(conf);
        conf->conf_files = kboot_conf_files,
        conf->global_options = kboot_global_options,
        conf_init_global_options(conf);
        conf->conf_files = kboot_conf_files,

+       conf->get_pair = conf_get_pair_equal;

        conf->process_pair = kboot_process_pair;
        conf->parser_info = (void *)kboot_ignored_names,
 
        conf->process_pair = kboot_process_pair;
        conf->parser_info = (void *)kboot_ignored_names,