diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-05-08 21:09:05 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-05-09 08:39:49 +0800 |
commit | 263e31240d97484619f55630f625257dc874c5d0 (patch) | |
tree | 37ae4718b7db726697fc9e38c84582889cae03b9 /discover/pxe-parser.c | |
parent | dc77d447920c6af88009ceea8b23a2172701d32b (diff) | |
download | talos-petitboot-263e31240d97484619f55630f625257dc874c5d0.tar.gz talos-petitboot-263e31240d97484619f55630f625257dc874c5d0.zip |
discover: handle boot_option->device_id entirely within handler
No need for parsers to populate (or forget to populate, in the case of
most parsers) opt->device_id, as we should do it on finalise.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/pxe-parser.c')
-rw-r--r-- | discover/pxe-parser.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c index 662716a..c300b69 100644 --- a/discover/pxe-parser.c +++ b/discover/pxe-parser.c @@ -28,10 +28,9 @@ static void pxe_process_pair(struct conf_context *ctx, opt = discover_boot_option_create(ctx->dc, ctx->dc->device); ctx->parser_info = opt; - opt->option->device_id = ctx->dc->device->device->id; opt->option->name = talloc_strdup(opt, value); opt->option->id = talloc_asprintf(opt, "%s@%p", - opt->option->device_id, opt); + ctx->dc->device->device->id, opt); return; } |