From patchwork Fri Mar 18 17:09:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8622391 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 931D9C0554 for ; Fri, 18 Mar 2016 17:12:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDE9920361 for ; Fri, 18 Mar 2016 17:12:07 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 91881202F2 for ; Fri, 18 Mar 2016 17:12:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1agxty-0006kD-O4; Fri, 18 Mar 2016 17:09:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1agxtx-0006jQ-4O for xen-devel@lists.xenproject.org; Fri, 18 Mar 2016 17:09:29 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id F6/B8-16378-8463CE65; Fri, 18 Mar 2016 17:09:28 +0000 X-Env-Sender: prvs=8782d2786=Ian.Jackson@citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1458320966!15631816!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37265 invoked from network); 18 Mar 2016 17:09:27 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 18 Mar 2016 17:09:27 -0000 X-IronPort-AV: E=Sophos;i="5.24,356,1454976000"; d="scan'208";a="346941196" From: Ian Jackson To: Date: Fri, 18 Mar 2016 17:09:14 +0000 Message-ID: <1458320955-2556-6-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1458320955-2556-1-git-send-email-ian.jackson@eu.citrix.com> References: <1458320955-2556-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 5/6] standalone-reset: Use suite-specific TftpDiVersion X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the config specifies a specific d-i version for the suite in use, it should be honoured. Signed-off-by: Ian Jackson --- standalone-reset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone-reset b/standalone-reset index e58ba68..bd34782 100755 --- a/standalone-reset +++ b/standalone-reset @@ -97,8 +97,8 @@ else ensure_dir "$tftp$tftptmp" dibase=`getconfig TftpDiBase` - diver=`getconfig TftpDiVersion` suite=`getconfig DebianSuite` + diver=`getconfig_TftpDiVersion_suite $suite` firmware=`getconfig DebianNonfreeFirmware` if [ "x$diver" = xcurrent ]; then