X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Floader.c;h=5c69533ff3cc821f96bbc313259bcb29d0cedf0f;hp=babca28a34950d0cd73fc88c8fa2f0be328f2b51;hb=5cceb42c773aa404456417685ea50b2ada5570a2;hpb=f8b433640debefa2bed2ab09af6deefb32251777

diff --git a/ui/common/loader.c b/ui/common/loader.c
index babca28..5c69533 100644
--- a/ui/common/loader.c
+++ b/ui/common/loader.c
@@ -227,7 +227,7 @@ enum wget_flags {
 static char *pb_load_wget(void *ctx, struct pb_url *url, enum wget_flags flags)
 {
 	int result;
-	const char *argv[6];
+	const char *argv[7];
 	const char **p;
 	char *local;
 
@@ -238,12 +238,15 @@ static char *pb_load_wget(void *ctx, struct pb_url *url, enum wget_flags flags)
 
 	p = argv;
 	*p++ = pb_system_apps.wget;			/* 1 */
-	*p++ = "-O";					/* 2 */
-	*p++ = local;					/* 3 */
-	*p++ = url->full;				/* 4 */
+#if !defined(DEBUG)
+	*p++ = "--quiet";				/* 2 */
+#endif
+	*p++ = "-O";					/* 3 */
+	*p++ = local;					/* 4 */
+	*p++ = url->full;				/* 5 */
 	if (flags & wget_no_check_certificate)
-		*p++ = "--no-check-certificate";	/* 5 */
-	*p++ = NULL;					/* 6 */
+		*p++ = "--no-check-certificate";	/* 6 */
+	*p++ = NULL;					/* 7 */
 
 	result = pb_run_cmd(argv);
 
@@ -260,16 +263,22 @@ fail:
 /**
  * pb_load_file - Loads a remote file and returns the local file path.
  * @ctx: The talloc context to associate with the returned string.
+ * @remote: The remote file URL.
+ * @tempfile: An optional variable pointer to be set when a temporary local
+ *  file is created.
  *
  * Returns the local file path in a talloc'ed character string on success,
  * or NULL on error.
  */
 
-char *pb_load_file(void *ctx, const char *remote)
+char *pb_load_file(void *ctx, const char *remote, unsigned int *tempfile)
 {
 	char *local;
 	struct pb_url *url = pb_url_parse(NULL, remote);
 
+	if (tempfile)
+		*tempfile = 0;
+
 	if (!url)
 		return NULL;
 
@@ -277,19 +286,28 @@ char *pb_load_file(void *ctx, const char *remote)
 	case pb_url_ftp:
 	case pb_url_http:
 		local = pb_load_wget(ctx, url, 0);
+		if (tempfile && local)
+			*tempfile = 1;
 		break;
 	case pb_url_https:
-		local = pb_load_wget(ctx, url,
-			wget_no_check_certificate);
+		local = pb_load_wget(ctx, url, wget_no_check_certificate);
+		if (tempfile && local)
+			*tempfile = 1;
 		break;
 	case pb_url_nfs:
 		local = pb_load_nfs(ctx, url);
+		if (tempfile && local)
+			*tempfile = 1;
 		break;
 	case pb_url_sftp:
 		local = pb_load_sftp(ctx, url);
+		if (tempfile && local)
+			*tempfile = 1;
 		break;
 	case pb_url_tftp:
 		local = pb_load_tftp(ctx, url);
+		if (tempfile && local)
+			*tempfile = 1;
 		break;
 	default:
 		local = talloc_strdup(ctx, url->full);