summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--discover/resource.c9
-rw-r--r--discover/resource.h5
2 files changed, 8 insertions, 6 deletions
diff --git a/discover/resource.c b/discover/resource.c
index b4fa9ca..25fff65 100644
--- a/discover/resource.c
+++ b/discover/resource.c
@@ -34,7 +34,8 @@ static struct discover_device *parse_device_string(
return device_lookup_by_name(handler, devstr);
}
-static void resolve_devpath_against_device(struct resource *res,
+
+void resolve_resource_against_device(struct resource *res,
struct discover_device *dev, const char *path)
{
char *resolved_path = join_paths(res, dev->mount_path, path);
@@ -67,7 +68,7 @@ struct resource *create_devpath_resource(struct discover_boot_option *opt,
/* we've been passed a file:// URL, which has no device
* specifier. We can resolve against the original
* device */
- resolve_devpath_against_device(res, orig_device,
+ resolve_resource_against_device(res, orig_device,
url->path);
talloc_free(url);
}
@@ -76,7 +77,7 @@ struct resource *create_devpath_resource(struct discover_boot_option *opt,
/* if there was no device specified, we can resolve now */
if (!pos) {
- resolve_devpath_against_device(res, orig_device, devpath);
+ resolve_resource_against_device(res, orig_device, devpath);
return res;
}
@@ -109,7 +110,7 @@ bool resolve_devpath_resource(struct device_handler *handler,
if (!dev)
return false;
- resolve_devpath_against_device(res, dev, info->path);
+ resolve_resource_against_device(res, dev, info->path);
talloc_free(info);
return true;
diff --git a/discover/resource.h b/discover/resource.h
index 3ef13a5..ae993e8 100644
--- a/discover/resource.h
+++ b/discover/resource.h
@@ -22,6 +22,9 @@ struct resource {
};
};
+void resolve_resource_against_device(struct resource *res,
+ struct discover_device *dev, const char *path);
+
/**
* devpath resources.
*
@@ -47,7 +50,5 @@ struct resource *create_url_resource(struct discover_boot_option *opt,
bool resolve_devpath_resource(struct device_handler *dev,
struct resource *res);
-
-
#endif /* RESOURCE_H */
OpenPOWER on IntegriCloud