X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fresource.c;h=c09c1c51051679900b11dfc513b8f115436239f5;hp=b4fa9ca3930f350b8622027a793c0a5be427ef55;hb=638f16c7683db165154bbe53772c4b864f9dc90d;hpb=a5db3ced87f5f24500f785b70af8b8630bc1c077

diff --git a/discover/resource.c b/discover/resource.c
index b4fa9ca..c09c1c5 100644
--- a/discover/resource.c
+++ b/discover/resource.c
@@ -1,5 +1,7 @@
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <assert.h>
 #include <stdbool.h>
@@ -34,7 +36,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 +70,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,14 +79,14 @@ 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;
 	}
 
 	devstr = talloc_strndup(res, devpath, pos - devpath);
 	path = talloc_strdup(res, pos + 1);
 
-	pb_log("%s: resource depends on device %s\n", __func__, devstr);
+	pb_log_fn("resource depends on device %s\n", devstr);
 
 	/* defer resolution until we can find a suitable matching device */
 	info = talloc(res, struct devpath_resource_info);
@@ -109,7 +112,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;
@@ -121,6 +124,7 @@ struct resource *create_url_resource(struct discover_boot_option *opt,
 	struct resource *res;
 
 	res = talloc(opt, struct resource);
+	talloc_steal(res, url);
 	res->url = url;
 	res->resolved = true;