X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=discover%2Fboot.c;h=ba4e7208fc7cf700a86c87fad4a8b5e4f092e375;hb=e3f78333a2a16760d6a497b84329c103208e921e;hp=5347fd7c1d45bbfbe748deaa12b44cdb2c4d930c;hpb=454f924bbcda7904c4348ef45c3d0d293768a48c;p=petitboot

diff --git a/discover/boot.c b/discover/boot.c
index 5347fd7..ba4e720 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -45,6 +45,7 @@ static void __attribute__((format(__printf__, 4, 5))) update_status(
 	va_end(ap);
 
 	status.type = type;
+	status.backlog = false;
 
 	pb_debug("boot status: [%d] %s\n", type, status.message);
 
@@ -522,7 +523,8 @@ static int start_url_load(struct boot_task *task, const char *name,
 	if (!url)
 		return 0;
 
-	*result = load_url_async(task, url, boot_process, task);
+	*result = load_url_async(task, url, boot_process, task, NULL,
+				 task->status_arg);
 	if (!*result) {
 		update_status(task->status_fn, task->status_arg,
 				STATUS_ERROR, _("Error loading %s"), name);
@@ -577,6 +579,11 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		dtb = opt->dtb->url;
 	}
 
+	if (opt && opt->proxy) {
+		setenv("http_proxy", opt->proxy, 1);
+		setenv("https_proxy", opt->proxy, 1);
+	}
+
 	boot_task = talloc_zero(ctx, struct boot_task);
 	boot_task->dry_run = dry_run;
 	boot_task->status_fn = status_fn;