X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.h;h=7fe285b7b831c3c5ec7e33ea7474e7b48287c4a3;hp=0f2734133bc80c9d43cec55c5c1d4461f6cdfe5b;hb=fed2c4da36c2708f2a5a7a09eba61d014b9339d6;hpb=9f42e56fc5968fcb34edfad017adb73960c2bb61

diff --git a/discover/boot.h b/discover/boot.h
index 0f27341..7fe285b 100644
--- a/discover/boot.h
+++ b/discover/boot.h
@@ -7,7 +7,7 @@
 struct boot_option;
 struct boot_command;
 
-typedef void (*boot_status_fn)(void *arg, struct boot_status *);
+typedef void (*boot_status_fn)(void *arg, struct status *);
 
 struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		struct boot_command *cmd, int dry_run,
@@ -16,9 +16,6 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 void boot_cancel(struct boot_task *task);
 
 struct boot_task {
-	struct load_url_result *image;
-	struct load_url_result *initrd;
-	struct load_url_result *dtb;
 	const char *local_image;
 	const char *local_initrd;
 	const char *local_dtb;
@@ -33,14 +30,20 @@ struct boot_task {
 	bool cancelled;
 	bool verify_signature;
 	bool decrypt_files;
-	struct load_url_result *image_signature;
-	struct load_url_result *initrd_signature;
-	struct load_url_result *dtb_signature;
-	struct load_url_result *cmdline_signature;
 	const char *local_image_signature;
 	const char *local_initrd_signature;
 	const char *local_dtb_signature;
 	const char *local_cmdline_signature;
+	struct list resources;
+};
+
+struct boot_resource {
+	struct load_url_result *result;
+	struct pb_url *url;
+	const char **local_path;
+	const char *name;
+
+	struct list_item list;
 };
 
 enum {