diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-03-11 17:08:57 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-04-16 12:57:15 +0800 |
| commit | 92806cf6bc15f680f75879288df12ea9a87e4608 (patch) | |
| tree | 4a6650d8881dda3c6ee321d1e3350edc646c4baf /discover/kboot-parser.c | |
| parent | 7b396a45d43cc464539cc25799ddda3a27339bd8 (diff) | |
| download | talos-petitboot-92806cf6bc15f680f75879288df12ea9a87e4608.tar.gz talos-petitboot-92806cf6bc15f680f75879288df12ea9a87e4608.zip | |
discover: Separate temporary and permanent device data
At present, we keep both permanent (eg links/n_links) and temporary
(event) data in struct discover_context.
This change makes discover_context a temporary structure, just used
during actual device discovery. Once discovery is complete, the
permanent data (discover_device) is "committed" to the device handler.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/kboot-parser.c')
| -rw-r--r-- | discover/kboot-parser.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c index 2954d89..5d5090b 100644 --- a/discover/kboot-parser.c +++ b/discover/kboot-parser.c @@ -15,6 +15,7 @@ static void kboot_process_pair(struct conf_context *conf, const char *name, char *value) { const char *const *ignored_names = conf->parser_info; + struct device *dev; char *pos; char *args; const char *initrd; @@ -34,12 +35,13 @@ static void kboot_process_pair(struct conf_context *conf, const char *name, /* opt must be associated with dc */ - opt = talloc_zero(conf->dc->device, struct boot_option); + dev = conf->dc->device->device; + opt = talloc_zero(dev, struct boot_option); if (!opt) return; - opt->id = talloc_asprintf(opt, "%s#%s", conf->dc->device->id, name); + opt->id = talloc_asprintf(opt, "%s#%s", dev->id, name); opt->name = talloc_strdup(opt, name); args = talloc_strdup(opt, ""); @@ -79,7 +81,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_path); + opt->boot_image_file = resolve_path(opt, value, + conf->dc->device->device_path); if (root) { opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args); @@ -89,7 +92,7 @@ out_add: if (initrd) { opt->initrd_file = resolve_path(opt, initrd, - conf->dc->device_path); + conf->dc->device->device_path); opt->description = talloc_asprintf(opt, "%s initrd=%s %s", value, initrd, opt->boot_args); @@ -100,7 +103,7 @@ out_add: conf_strip_str(opt->boot_args); conf_strip_str(opt->description); - device_add_boot_option(conf->dc->device, opt); + discover_context_add_boot_option(conf->dc, opt); } static struct conf_global_option kboot_global_options[] = { |
