From patchwork Mon Jan 11 17:41:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 12011323 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 76038C433E0 for ; Mon, 11 Jan 2021 17:50:23 +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 435A5223E0 for ; Mon, 11 Jan 2021 17:50:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 435A5223E0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de 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.65226.115602 (Exim 4.92) (envelope-from ) id 1kz1KX-0006mX-7d; Mon, 11 Jan 2021 17:50:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65226.115602; Mon, 11 Jan 2021 17:50:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1KX-0006mO-3H; Mon, 11 Jan 2021 17:50:13 +0000 Received: by outflank-mailman (input) for mailman id 65226; Mon, 11 Jan 2021 17:50:11 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1El-0002a6-2L for xen-devel@lists.xenproject.org; Mon, 11 Jan 2021 17:44:15 +0000 Received: from mo4-p02-ob.smtp.rzone.de (unknown [85.215.255.81]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f70bf9f9-9d01-4a63-8e9f-ede50b08e041; Mon, 11 Jan 2021 17:42:44 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.12.1 SBL|AUTH) with ESMTPSA id h0968ex0BHgTM3L (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 11 Jan 2021 18:42:29 +0100 (CET) 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: f70bf9f9-9d01-4a63-8e9f-ede50b08e041 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1610386963; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=ti8CP/B9G6c5O+6wVpkEtLXEkgdKGjEhZREHyWZEFow=; b=GJjK49Yxqzkp6Pa1bPTpZFKFPvIUhTkTLoiBosEA+KkR77qS9jgqS6CLIBakywferL piGWxY4ughtnGl3Cxf9UTmpkoj2sRywPTynxx04NilIyukGNgvL0s43zi/V+BbXnh1Xp B4CAEsv8AiACDk98ZxbtVft716+avmcB09bELpqrUuHoA7bferUxlibQqLW/nA+4m3P/ wIIeQy61dYJ9/EAVgpiS7t39a5XbX6JnHFSu9AuJ0F+R1nAY4K+E4tb+N8xEMURhLe/j RH6mSgPeelAdExsj7zf5z4JS6JTYu+vvnm8NiUA1i3ZFpr899rjsRAjqdON4rdPlV7Rq BjSg== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2W0g" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Anthony PERARD Subject: [PATCH v20210111 06/39] Use XEN_SCRIPT_DIR to refer to /etc/xen/scripts Date: Mon, 11 Jan 2021 18:41:51 +0100 Message-Id: <20210111174224.24714-7-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210111174224.24714-1-olaf@aepfle.de> References: <20210111174224.24714-1-olaf@aepfle.de> MIME-Version: 1.0 Replace all hardcoded paths to use XEN_SCRIPT_DIR to expand the actual location. Update .gitignore. Signed-off-by: Olaf Hering Reviewed-by: Ian Jackson --- .gitignore | 3 +++ docs/configure.ac | 3 +++ ...k-configuration.5.pod => xl-disk-configuration.5.pod.in} | 2 +- ...onfiguration.5.pod => xl-network-configuration.5.pod.in} | 4 ++-- docs/man/xl.1.pod.in | 2 +- docs/man/{xl.conf.5.pod => xl.conf.5.pod.in} | 6 +++--- docs/misc/block-scripts.txt | 2 +- tools/xl/xl_cmdtable.c | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) rename docs/man/{xl-disk-configuration.5.pod => xl-disk-configuration.5.pod.in} (99%) rename docs/man/{xl-network-configuration.5.pod => xl-network-configuration.5.pod.in} (98%) rename docs/man/{xl.conf.5.pod => xl.conf.5.pod.in} (97%) diff --git a/.gitignore b/.gitignore index b169d78ed7..76c13f3189 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,10 @@ dist/* docs/tmp.* docs/html/ docs/man/xl.cfg.5.pod +docs/man/xl-disk-configuration.5.pod +docs/man/xl-network-configuration.5.pod docs/man/xl.1.pod +docs/man/xl.conf.5.pod docs/man1/ docs/man5/ docs/man7/ diff --git a/docs/configure.ac b/docs/configure.ac index cb5a6eaa4c..c2e5edd3b3 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -9,6 +9,9 @@ AC_CONFIG_FILES([ ../config/Docs.mk man/xl.cfg.5.pod man/xl.1.pod +man/xl-disk-configuration.5.pod +man/xl-network-configuration.5.pod +man/xl.conf.5.pod ]) AC_CONFIG_AUX_DIR([../]) diff --git a/docs/man/xl-disk-configuration.5.pod b/docs/man/xl-disk-configuration.5.pod.in similarity index 99% rename from docs/man/xl-disk-configuration.5.pod rename to docs/man/xl-disk-configuration.5.pod.in index 46feedb95e..71d0e86e3d 100644 --- a/docs/man/xl-disk-configuration.5.pod +++ b/docs/man/xl-disk-configuration.5.pod.in @@ -257,7 +257,7 @@ automatically determine the most suitable backend. Specifies that B is not a normal host path, but rather information to be interpreted by the executable program I