X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=discover%2Fboot.c;h=e57810d54d46a10687c0182d9004d63b0349d188;hb=d6166b471a9356355ed16747de3c0febd4b8cd3e;hp=ed30ef9fe085104d1e94f957d426e1c7555089e0;hpb=aaa1de0046295cfd1f7a5428f399a5d1f9e1e563;p=petitboot

diff --git a/discover/boot.c b/discover/boot.c
index ed30ef9..e57810d 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -321,6 +321,9 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 
 	result = -1;
 
+	boot_task.local_initrd = NULL;
+	boot_task.local_dtb = NULL;
+
 	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 			"loading kernel");
 	boot_task.local_image = load_url(NULL, image, &clean_image);
@@ -330,7 +333,6 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 		goto no_load;
 	}
 
-	boot_task.local_initrd = NULL;
 	if (initrd) {
 		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 				"loading initrd");
@@ -342,7 +344,6 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 		}
 	}
 
-	boot_task.local_dtb = NULL;
 	if (dtb) {
 		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 				"loading device tree");