X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=e67ed00eec6b05de9845490c1b53241184675988;hp=6109562491db79855655a4bf8431e07c20bd1e0f;hb=359f12f9eb0440294a8be1b78ade1b69926d2896;hpb=c62667e5c78ea212e5ac49244e9792954a1d8f71

diff --git a/discover/boot.c b/discover/boot.c
index 6109562..e67ed00 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -103,6 +103,7 @@ int boot(void *ctx, struct boot_option *opt, struct boot_command *cmd,
 	char *image, *initrd, *args;
 	int result;
 
+	local_initrd = NULL;
 	image = NULL;
 	initrd = NULL;
 	args = NULL;
@@ -117,9 +118,9 @@ int boot(void *ctx, struct boot_option *opt, struct boot_command *cmd,
 	}
 
 	if (cmd->initrd_file) {
-		image = talloc_strdup(ctx, cmd->initrd_file);
+		initrd = talloc_strdup(ctx, cmd->initrd_file);
 	} else if (opt && opt->initrd_file) {
-		image = talloc_strdup(ctx, opt->initrd_file);
+		initrd = talloc_strdup(ctx, opt->initrd_file);
 	}
 
 	if (cmd->boot_args) {
@@ -134,7 +135,6 @@ int boot(void *ctx, struct boot_option *opt, struct boot_command *cmd,
 	if (!local_image)
 		goto no_load;
 
-	local_initrd = NULL;
 	if (initrd) {
 		local_initrd = load_file(NULL, initrd, &clean_initrd);
 		if (!local_initrd)