From patchwork Mon Dec 19 04:19:05 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: 706928 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3thnm63g5Pz9s65 for ; Mon, 19 Dec 2016 15:21: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="qqs3+yZT"; 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 3thnm62cvnzDwJQ for ; Mon, 19 Dec 2016 15:21: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="qqs3+yZT"; 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 3thnkl6PCjzDwHV for ; Mon, 19 Dec 2016 15:19:59 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="qqs3+yZT"; 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 50BC7143FB8; Mon, 19 Dec 2016 12:19:56 +0800 (SGT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mendozajonas.com; s=mail; t=1482121197; bh=m5f6K0xqyxlaCsCjO6EWwKSF9fo+auvKWLzDGrJd8bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qqs3+yZTkD4MDWwUJQ1Kf2NDCs/ILmjLXWiMTVOB9OoaZgxQ+0jEGJo8fJSOpOBIP QL4M9/GTciHA3qAZdW5zmCQGe1l9VzB2S2vssXBZdF8HVOysDTVXm9b38ypGSNAuM1 MKE2/JXqg2inEds/SzP78ttruGPD9gFZW49yhzMM= From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 19/29] discover/status: Use full URL in parse status message Date: Mon, 19 Dec 2016 15:19:05 +1100 Message-Id: <20161219041915.30497-20-sam@mendozajonas.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161219041915.30497-1-sam@mendozajonas.com> References: <20161219041915.30497-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" From: Jeremy Kerr ->conf_url is the base address, we want the actual loaded URL. Signed-off-by: Jeremy Kerr Signed-off-by: Samuel Mendoza-Jonas --- discover/pxe-parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c index 90af66b..eab6c6a 100644 --- a/discover/pxe-parser.c +++ b/discover/pxe-parser.c @@ -296,7 +296,7 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data) */ device_handler_status_dev_info(handler, conf->dc->device, _("Parsed PXE config from %s"), - pb_url_to_string(conf->dc->conf_url)); + pb_url_to_string(result->url)); talloc_free(buf); out_clean: