From patchwork Fri Jan 22 15:56:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039855 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63003C4332E for ; Fri, 22 Jan 2021 15:56:28 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 292302343E for ; Fri, 22 Jan 2021 15:56:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 292302343E Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.72901.131417 (Exim 4.92) (envelope-from ) id 1l2ynH-0004eB-IU; Fri, 22 Jan 2021 15:56:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72901.131417; Fri, 22 Jan 2021 15:56:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynH-0004dp-5b; Fri, 22 Jan 2021 15:56:15 +0000 Received: by outflank-mailman (input) for mailman id 72901; Fri, 22 Jan 2021 15:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0004bE-DI for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0002OV-Bi for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0000Rr-Ai for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynD-0004Ar-Lf; Fri, 22 Jan 2021 15:56:11 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=LXz2SBk/tge0HrEhZ4XkureLZrztgn20+8xs7mXTcOo=; b=5SdFw+NmNwDqyrwk0WHsEfwEOC /we6ebyivbGdXtob6RxEI3helLxkswRcWjq1UH41lVvkeVkOV6N/d4wDltgRppIgvHd8gVxdr1a0k S7oyxlclfx719KSIAuWAPhVMJ/Q0XHSlyaMQ0FOjOcbqpE6/QOK1ut89rNeptDwyRVvQ=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 5/7] ts-xen-install: Honour xenstored target var Date: Fri, 22 Jan 2021 15:56:01 +0000 Message-Id: <20210122155603.23402-5-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122155603.23402-1-iwj@xenproject.org> References: <20210122155603.23402-1-iwj@xenproject.org> MIME-Version: 1.0 Nothing sets this yet. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 1 + ts-xen-install | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 9e85303a..a0ca6943 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -179,6 +179,7 @@ our @accessible_runvar_pats = host_linux_boot_append *_host_linux_boot_append host_ip *_host_ip host_power_install *_host_power_install + host_xenstored *_host_xenstored ); #---------- test script startup ---------- diff --git a/ts-xen-install b/ts-xen-install index fc4bf423..47865eb6 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -142,6 +142,13 @@ sub adjustconfig () { ( "XENCONSOLED_TRACE" => "guest", ); + + my $xenstored = target_var($ho, 'xenstored'); + if (defined $xenstored) { + $xenstored = "/usr/local/sbin/$xenstored" unless $xenstored =~ m{/}; + push @commons_config, "XENSTORED", $xenstored; + } + target_editfile_root($ho, $commons_config_file, sub { target_editfile_kvp_replace(@commons_config) });