diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-09-16 16:47:17 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-09-24 13:14:59 +0800 |
commit | 1513dd5d05f6408a64e19ea18cfaeb0cb8c5fb73 (patch) | |
tree | 5290f1c2d6c57d2d084426d38fa4eb3a7fb187b4 /discover/grub2/grub2.c | |
parent | 64899475f9b895628fd7b654f7b549e50494229a (diff) | |
download | talos-petitboot-1513dd5d05f6408a64e19ea18cfaeb0cb8c5fb73.tar.gz talos-petitboot-1513dd5d05f6408a64e19ea18cfaeb0cb8c5fb73.zip |
discover/grub2: Implement 'linux' & 'initrd' commands
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/grub2/grub2.c')
-rw-r--r-- | discover/grub2/grub2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/discover/grub2/grub2.c b/discover/grub2/grub2.c index ebc6ac7..fb3d866 100644 --- a/discover/grub2/grub2.c +++ b/discover/grub2/grub2.c @@ -31,14 +31,14 @@ static const char *const grub2_conf_files[] = { }; struct grub2_resource_info { - struct grub2_root *root; + char *root; char *path; }; /* we use slightly different resources for grub2 */ struct resource *create_grub2_resource(void *ctx, struct discover_device *orig_device, - struct grub2_root *root, const char *path) + const char *root, const char *path) { struct grub2_resource_info *info; struct resource *res; @@ -47,8 +47,8 @@ struct resource *create_grub2_resource(void *ctx, if (root) { info = talloc(res, struct grub2_resource_info); - info->root = root; talloc_reference(info, root); + info->root = talloc_strdup(info, root); info->path = talloc_strdup(info, path); res->resolved = false; @@ -68,7 +68,7 @@ bool resolve_grub2_resource(struct device_handler *handler, assert(!res->resolved); - dev = device_lookup_by_uuid(handler, info->root->uuid); + dev = device_lookup_by_uuid(handler, info->root); if (!dev) return false; |