X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.h;h=20a22495042b7780820ea3f12678108218d26a11;hp=26d4ce41eb2a946c8bc9f13b5e5ba7b60637f4a6;hb=9974f2d82b9450eaccd7661b3bfabb686ab8e161;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1

diff --git a/discover/paths.h b/discover/paths.h
index 26d4ce4..20a2249 100644
--- a/discover/paths.h
+++ b/discover/paths.h
@@ -1,41 +1,7 @@
 #ifndef PATHS_H
 #define PATHS_H
 
-/**
- * Given a string (eg /dev/sda1, sda1 or UUID=B8E53381CA9EA0E3), parse the
- * device path (eg /dev/sda1). Any device descriptions read from config files
- * should be parsed into the path first.
- *
- * The cur_dev is provided for some remapping situations. If NULL is provided,
- * no remapping will be done.
- *
- * Returns a newly-allocated string.
- */
-char *parse_device_path(const char *dev_str, const char *current_device);
-
-/**
- * Get the mountpoint for a device.
- */
-const char *mountpoint_for_device(const char *dev);
-
-/**
- * Resolve a path given in a config file, to a path in the local filesystem.
- * Paths may be of the form:
- *  device:path (eg /dev/sda:/boot/vmlinux)
- *
- * or just a path:
- *  /boot/vmlinux
- * - in this case, the current mountpoint is used.
- *
- * Returns a newly-allocated string containing a full path to the file in path
- */
-char *resolve_path(const char *path, const char *current_device);
-
-
-/**
- * Set the base directory for newly-created mountpoints
- */
-void set_mount_base(const char *path);
+#include <url/url.h>
 
 /**
  * Utility function for joining two paths. Adds a / between a and b if
@@ -43,11 +9,14 @@ void set_mount_base(const char *path);
  *
  * Returns a newly-allocated string.
  */
-char *join_paths(const char *a, const char *b);
+char *join_paths(void *alloc_ctx, const char *a, const char *b);
 
 /**
- * encode a disk label (or uuid) for use in a symlink.
+ * Returns the base path for mount points
  */
-char *encode_label(const char *label);
+const char *mount_base(void);
+
+/* Load a (potentially remote) file, and return a guaranteed-local name */
+char *load_url(void *ctx, struct pb_url *url, unsigned int *tempfile);
 
 #endif /* PATHS_H */