From nobody Tue Nov 4 11:29:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1602095231; cv=none; d=zohomail.com; s=zohoarc; b=OTRbqfoZ40xlEcBRbigeWyVs5k4g9dPZQ8ZjNoLJvy8hkkxFXhigMjwCSbi2KAVuVel1CEFvTdp+L2hLEQYbV6LgWHfRwUPiOCHEhFE2IzYHI3ZKJ2Pt0yJ9vS5HwtwvPoygM9+0J1zIKf0BoIVRie5ucpGGnIwbKKrcGjLb3v0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602095231; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cr7pbV6VhTLigsfw1Rdx3J1+wPRZI1kWoRiLPmAhAmQ=; b=VDQGd1lSUeKR8GojaAQH3h6qAyOFNkMIMr/TRb9549q+eRoeqo5eWf5qPlkjcmPAebpfAoeQ50rElXWuZn9bPvPXZWl8CT5GdCWxHmkyON9oYF6i9YCK5GBK9uMMsMQAQr2BSyXoEeS6dOzn1+GVJBIgKwtYgM8uQpypYKm/FHA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1602095231210333.43490135014827; Wed, 7 Oct 2020 11:27:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.3681.10747 (Exim 4.92) (envelope-from ) id 1kQE9Q-0001AU-1U; Wed, 07 Oct 2020 18:26:56 +0000 Received: by outflank-mailman (output) from mailman id 3681.10747; Wed, 07 Oct 2020 18:26:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE9P-0001AE-Si; Wed, 07 Oct 2020 18:26:55 +0000 Received: by outflank-mailman (input) for mailman id 3681; Wed, 07 Oct 2020 18:26:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE5k-00072Q-Op for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:23:08 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b7be757a-7ef1-4450-aafd-609299bbaff6; Wed, 07 Oct 2020 18:21:19 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDk7-0007CF-AN; Wed, 07 Oct 2020 19:00:47 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE5k-00072Q-Op for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:23:08 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b7be757a-7ef1-4450-aafd-609299bbaff6; Wed, 07 Oct 2020 18:21:19 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDk7-0007CF-AN; Wed, 07 Oct 2020 19:00:47 +0100 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b7be757a-7ef1-4450-aafd-609299bbaff6 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 56/82] subst_netboot_template: Do not use all of %r Date: Wed, 7 Oct 2020 18:59:58 +0100 Message-Id: <20201007180024.7932-57-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201007180024.7932-1-iwj@xenproject.org> References: <20201007180024.7932-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ian Jackson Instead of copying all of %r into %v, have the template substitutor fall back to %r from %v. This is going to be important when we have host-reuse-related access control to %r. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index be6b7119..634d6d2e 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2876,6 +2876,7 @@ sub subst_netboot_template ($$$) { $pat =3D~ s{\%(\w*)\%}{ $1 eq '' ? '%' : defined($v->{$1}) ? $v->{$1} : + defined($r{$1}) ? $r{$1} : next; }ge; # and return the first pattern we managed to completely substitute @@ -2890,7 +2891,7 @@ sub host_netboot_file ($;$) { # returns the full netboot filename path # in array context, returns (dir, pathtail) # where dir does not depend on $templatekeytail - my %v =3D %r; + my %v; my $firmware =3D get_host_property($ho, "firmware"); my $templatekeybase =3D $firmware eq 'uefi' ? 'NetGrub' : 'Pxe'; $templatekeytail //=3D 'Templates'; --=20 2.20.1