po: Minor Russian translation updates

[petitboot] / discover / kboot-parser.c

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index cb6a2483bc3092756e2d488a9b3e0b6588114745..cebe787fddb44d5c480461f4f91c38e207e992a5 100644 (file)
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -1,4 +1,6 @@
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif

 
 #include <assert.h>
 #include <stdlib.h>
 
 #include <assert.h>
 #include <stdlib.h>


@@ -9,7 +11,7 @@
 #include "types/types.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
 #include "types/types.h"
 #include "parser-conf.h"
 #include "parser-utils.h"

-#include "paths.h"
+#include "resource.h"

 
 static void kboot_process_pair(struct conf_context *conf, const char *name,
                char *value)
 
 static void kboot_process_pair(struct conf_context *conf, const char *name,
                char *value)


@@ -21,6 +23,7 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
        char *args;
        const char *initrd;
        const char *root;
        char *args;
        const char *initrd;
        const char *root;

+       const char *dtb;

 
        /* ignore bare values */
 
 
        /* ignore bare values */
 


@@ -45,10 +48,12 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
        opt->id = talloc_asprintf(opt, "%s#%s", conf->dc->device->device->id,
                        name);
        opt->name = talloc_strdup(opt, name);
        opt->id = talloc_asprintf(opt, "%s#%s", conf->dc->device->device->id,
                        name);
        opt->name = talloc_strdup(opt, name);

+       d_opt->option = opt;

 
        args = talloc_strdup(opt, "");
        initrd = conf_get_global_option(conf, "initrd");
        root = conf_get_global_option(conf, "root");
 
        args = talloc_strdup(opt, "");
        initrd = conf_get_global_option(conf, "initrd");
        root = conf_get_global_option(conf, "root");

+       dtb = conf_get_global_option(conf, "dtb");

 
        pos = strchr(value, ' ');
 
 
        pos = strchr(value, ' ');
 


@@ -78,13 +83,18 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
                        continue;
                }
 
                        continue;
                }
 

+               if (streq(cl_name, "dtb")) {
+                       dtb = cl_value;
+                       continue;
+               }
+

                args = talloc_asprintf_append(args, "%s=%s ", cl_name,
                        cl_value);
        }
 
 out_add:
                args = talloc_asprintf_append(args, "%s=%s ", cl_name,
                        cl_value);
        }
 
 out_add:

-       opt->boot_image_file = resolve_path(opt, value,
-                       conf->dc->device->device_path);
+       d_opt->boot_image = create_devpath_resource(d_opt,
+                               conf->dc->device, value);

 
        if (root) {
                opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args);
 
        if (root) {
                opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args);


@@ -92,15 +102,22 @@ out_add:
        } else
                opt->boot_args = args;
 
        } else
                opt->boot_args = args;
 

+       opt->description = talloc_asprintf(opt, "%s %s", value,
+                       opt->boot_args);
+

        if (initrd) {
        if (initrd) {

-               opt->initrd_file = resolve_path(opt, initrd,
-                               conf->dc->device->device_path);
+               d_opt->initrd = create_devpath_resource(d_opt,
+                               conf->dc->device, initrd);
+               opt->description = talloc_asprintf_append(opt->description,
+                               " initrd=%s", initrd);
+       }

 
 

-               opt->description = talloc_asprintf(opt, "%s initrd=%s %s",
-                       value, initrd, opt->boot_args);
-       } else
-               opt->description = talloc_asprintf(opt, "%s %s", value,
-                       opt->boot_args);
+       if (dtb) {
+               d_opt->dtb = create_devpath_resource(d_opt,
+                               conf->dc->device, dtb);
+               opt->description = talloc_asprintf_append(opt->description,
+                               " dtb=%s", dtb);
+       }

 
        conf_strip_str(opt->boot_args);
        conf_strip_str(opt->description);
 
        conf_strip_str(opt->boot_args);
        conf_strip_str(opt->description);


@@ -109,6 +126,7 @@ out_add:
 }
 
 static struct conf_global_option kboot_global_options[] = {
 }
 
 static struct conf_global_option kboot_global_options[] = {

+       { .name = "dtb" },

        { .name = "initrd" },
        { .name = "root" },
        { .name = "video" },
        { .name = "initrd" },
        { .name = "root" },
        { .name = "video" },


@@ -135,30 +153,46 @@ static const char *const kboot_ignored_names[] = {
        NULL
 };
 
        NULL
 };
 

-static int kboot_parse(struct discover_context *dc, char *buf, int len)
+static int kboot_parse(struct discover_context *dc)

 {
        struct conf_context *conf;
 {
        struct conf_context *conf;

+       const char * const *filename;
+       char *buf;
+       int len, rc;
+
+       /* Support block device boot only at present */
+       if (dc->event)
+               return -1;

 
        conf = talloc_zero(dc, struct conf_context);
 
        if (!conf)
 
        conf = talloc_zero(dc, struct conf_context);
 
        if (!conf)

-               return 0;
+               return -1;

 
        conf->dc = dc;
        conf->global_options = kboot_global_options,
        conf_init_global_options(conf);
        conf->get_pair = conf_get_pair_equal;
        conf->process_pair = kboot_process_pair;
 
        conf->dc = dc;
        conf->global_options = kboot_global_options,
        conf_init_global_options(conf);
        conf->get_pair = conf_get_pair_equal;
        conf->process_pair = kboot_process_pair;

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

 
 

-       conf_parse_buf(conf, buf, len);
+       for (filename = kboot_conf_files; *filename; filename++) {
+               rc = parser_request_file(dc, dc->device, *filename, &buf, &len);
+               if (rc)
+                       continue;
+
+               conf_parse_buf(conf, buf, len);
+               talloc_free(buf);
+       }

 
        talloc_free(conf);
 
        talloc_free(conf);

-       return 1;
+       return 0;

 }
 
 }
 

-struct parser __kboot_parser = {
-       .name           = "kboot",
-       .parse          = kboot_parse,
-       .filenames      = kboot_conf_files,
+static struct parser kboot_parser = {
+       .name                   = "kboot",
+       .parse                  = kboot_parse,
+       .resolve_resource       = resolve_devpath_resource,

 };
 };

+
+register_parser(kboot_parser);