From patchwork Tue Oct 25 03:44:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 686300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t2zYy4p9Sz9t1L for ; Tue, 25 Oct 2016 14:45:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=zmNLOTfw; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3t2zYy3l4tzDvjx for ; Tue, 25 Oct 2016 14:45:10 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=zmNLOTfw; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from mendozajonas.com (mendozajonas.com [188.166.185.233]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3t2zYr6vZPzDvjp for ; Tue, 25 Oct 2016 14:45:04 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=zmNLOTfw; dkim-atps=neutral Received: from skellige.ozlabs.ibm.com (unknown [122.99.82.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: sam@mendozajonas.com) by mendozajonas.com (Postfix) with ESMTPSA id CE3DC143FB3; Tue, 25 Oct 2016 11:45:01 +0800 (SGT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mendozajonas.com; s=mail; t=1477367102; bh=mIhQawBLZIRAliyczWcNaqTSGcX4TkuvDj2QbF+qjMk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zmNLOTfw/YcjDgEE4KqNHG6bxtE9aLkxVpYcLGE3S5tJHi68Adyi7PnZoM5YmqDFY /OhuyXPBOR7DGBL7NB7mmsJ45nWPHMD0X6Y5ucCgM5PPPcFwGKy5lQNcaCPplsdmz8 CpbRV2eUd8x9xaexaKj48SMB+yo8IqB7ke/2v6Q8= From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 4/6] discover/paths: Set --quiet for wget according to flags Date: Tue, 25 Oct 2016 14:44:46 +1100 Message-Id: <20161025034448.28723-4-sam@mendozajonas.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161025034448.28723-1-sam@mendozajonas.com> References: <20161025034448.28723-1-sam@mendozajonas.com> X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" wget is by default set to quiet mode, but in the case where process IO is being actively watched it would be ideal to have some output. If a custom IO callback is defined, do not set --quiet. Signed-off-by: Samuel Mendoza-Jonas --- discover/paths.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/discover/paths.c b/discover/paths.c index e2213a0..f083ced 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -307,8 +307,9 @@ static void load_tftp(struct load_task *task) } enum wget_flags { - wget_empty = 0, - wget_no_check_certificate = 1, + wget_empty = 0x1, + wget_no_check_certificate = 0x2, + wget_verbose = 0x4, }; /** @@ -332,9 +333,16 @@ static void load_wget(struct load_task *task, int flags) int i; i = 3; -#if !defined(DEBUG) - argv[i++] = "--quiet"; +#if defined(DEBUG) + flags |= wget_verbose; #endif + if ((flags & wget_verbose) == 0) { + argv[i++] = "--quiet"; + } else { + task->process->add_stderr = true; + task->process->keep_stdout = true; + } + if (flags & wget_no_check_certificate) argv[i++] = "--no-check-certificate"; @@ -382,6 +390,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url, { struct load_url_result *result; struct load_task *task; + int flags = 0; if (!url) return NULL; @@ -397,16 +406,20 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url, task->async_data = async_data; task->process->exit_cb = load_url_process_exit; task->process->data = task; - task->process->custom_stdout_cb = stdout_cb; + if (stdout_cb) { + task->process->custom_stdout_cb = stdout_cb; + flags |= wget_verbose; + } } switch (url->scheme) { case pb_url_ftp: case pb_url_http: - load_wget(task, 0); + load_wget(task, flags); break; case pb_url_https: - load_wget(task, wget_no_check_certificate); + flags |= wget_no_check_certificate; + load_wget(task, flags); break; case pb_url_nfs: load_nfs(task);