diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-04-16 16:58:18 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-04-29 14:41:04 +1000 |
| commit | 5be946cda7b8e2271ade6188ca3f5dc068826619 (patch) | |
| tree | a62a64792bb61aa57c5d8dac36c7df9756d01ef8 /discover/kboot-parser.c | |
| parent | 4e8b779626da98e2896efbb2df99b64f76e878f6 (diff) | |
| download | talos-petitboot-5be946cda7b8e2271ade6188ca3f5dc068826619.tar.gz talos-petitboot-5be946cda7b8e2271ade6188ca3f5dc068826619.zip | |
discover: Change parsers to emit resources rather than filenames
This change switches the parsers over to populate the resources in
discover_boot_option, rather than the string parameters in boot_option.
To do this, we need a few things:
* Add struct resources to discover_boot_option for the boot_image,
initrd and icon data.
* Have the parsers populate the resources, rather than the strings.
Currently, parsers can all use the devpath resource type.
* Add a resolve_resource callback to parsers; this is how the device
handler will attempt to resolve resources.
* Change load_file to load_url, as we should be only accessing
(resolved) resources by URLs.
This then allows us to remove the mount map, and associated lookup code,
as well as the UUID and label links to devices.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/kboot-parser.c')
| -rw-r--r-- | discover/kboot-parser.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c index cb6a248..e602dc4 100644 --- a/discover/kboot-parser.c +++ b/discover/kboot-parser.c @@ -9,7 +9,7 @@ #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) @@ -83,8 +83,8 @@ static void kboot_process_pair(struct conf_context *conf, const char *name, } out_add: - opt->boot_image_file = resolve_path(opt, value, - conf->dc->device->device_path); + d_opt->boot_image = create_devpath_resource(opt, + conf->dc->device, value); if (root) { opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args); @@ -93,8 +93,8 @@ out_add: opt->boot_args = args; if (initrd) { - opt->initrd_file = resolve_path(opt, initrd, - conf->dc->device->device_path); + d_opt->initrd = create_devpath_resource(opt, + conf->dc->device, initrd); opt->description = talloc_asprintf(opt, "%s initrd=%s %s", value, initrd, opt->boot_args); @@ -158,7 +158,8 @@ static int kboot_parse(struct discover_context *dc, char *buf, int len) } struct parser __kboot_parser = { - .name = "kboot", - .parse = kboot_parse, - .filenames = kboot_conf_files, + .name = "kboot", + .parse = kboot_parse, + .filenames = kboot_conf_files, + .resolve_resource = resolve_devpath_resource, }; |
