From patchwork Fri Jun 21 09:29:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 11009127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 365336C5 for ; Fri, 21 Jun 2019 09:32:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22543288E2 for ; Fri, 21 Jun 2019 09:32:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 130B0289E0; Fri, 21 Jun 2019 09:32:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D0CCE288E2 for ; Fri, 21 Jun 2019 09:32:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1heFsb-00071c-Ur; Fri, 21 Jun 2019 09:30:45 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1heFsa-00071T-KU for xen-devel@lists.xenproject.org; Fri, 21 Jun 2019 09:30:44 +0000 X-Inumbo-ID: 3d22df0e-9407-11e9-8980-bc764e045a96 Received: from mo6-p01-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5301::6]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 3d22df0e-9407-11e9-8980-bc764e045a96; Fri, 21 Jun 2019 09:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1561109442; s=strato-dkim-0002; d=aepfle.de; h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=NDLps3WtiFd3cQF1TzZ+c1WrtSoV6B0SwFGCGHThyz0=; b=b0iXvXEdrjypaYk2DoXE071iXxaYWs9RuMO9lPWhsYDGwZhULoTy6g6HMkk/Ho2WtT C95dAPOQK2lYfPcoL1xv+p2KD2OJ9HZpybbS6oCqZRPhHArqBH0ZDQ4GKBd/kOHV4CJ6 j0/J5hxk/n+FIn+4xIhq5ahSVraSCnpYqkX1GPoREqbh/vUzI/hR+eRuPlolMNj8UtCO UK2MooEcSiSVuEq6zKkG+j/wO957dQHEktf/a0aOqix7vxvQ/7tkriee2jsfANEYj2dD osr1FtjiB0c6dcgTciI29NJ7GH3bLVYkJgxyo+WzLEA/U0bMVL+npLIJB6gc5ih/SkYe IGEw== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuznLRsvz6zGrN/JP2665" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 44.24 AUTH) with ESMTPSA id 60b3d8v5L9TmB6S (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Fri, 21 Jun 2019 11:29:48 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Fri, 21 Jun 2019 11:29:44 +0200 Message-Id: <20190621092944.29241-1-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v1] Use XEN_SCRIPT_DIR to refer to /etc/xen/scripts X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Olaf Hering , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Now that scripts are stored in libexec, replace all hardcoded paths to use XEN_SCRIPT_DIR to expand the actual location. Update .gitignore. Signed-off-by: Olaf Hering --- .gitignore | 3 +++ docs/configure.ac | 3 +++ .../{xl-disk-configuration.5.pod => xl-disk-configuration.5.pod.in} | 2 +- ...etwork-configuration.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 a77cbff02c..78577857ea 100644 --- a/.gitignore +++ b/.gitignore @@ -47,7 +47,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 e795bec04c..169480da6c 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 7965d5dd73..95c23b4a92 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