From patchwork Mon Oct 17 14:11:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9379431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 24B0F607D4 for ; Mon, 17 Oct 2016 14:15:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15E6528858 for ; Mon, 17 Oct 2016 14:15:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A0DC2927D; Mon, 17 Oct 2016 14:15:09 +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=-4.2 required=2.0 tests=BAYES_00, 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 AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6244328858 for ; Mon, 17 Oct 2016 14:15: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 1bw8eH-0001xA-R9; Mon, 17 Oct 2016 14:12:17 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bw8eG-0001x4-PR for xen-devel@lists.xenproject.org; Mon, 17 Oct 2016 14:12:16 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id CA/36-15404-04CD4085; Mon, 17 Oct 2016 14:12:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeJIrShJLcpLzFFi42JxWrrBXtf+Dku EwafPqhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bh5YfYC9ZKVHTtjGhgXCvUxcjJISHgL3Ho yEUmEJtNQFeiactfti5GDg4RARWJ23sNuhi5OJgFWhklvj2bxAxSIyzgKXG1ZRYLiM0ioCrx7 +dkVhCbV8BDYs6s42wQM+Ukzh//CVbPCRT/sv8K2EwhAXeJuauUIEw1ibnr4yE6BSVOznwCNp FZQELi4IsXzCAlEgLcEn+77Scw8s1CUjULSdUCRqZVjOrFqUVlqUW6FnpJRZnpGSW5iZk5uoY GZnq5qcXFiempOYlJxXrJ+bmbGIGhxAAEOxhnX/Y/xCjJwaQkynumiCVCiC8pP6UyI7E4I76o NCe1+BCjDAeHkgQv/22gnGBRanpqRVpmDjCoYdISHDxKIrzPQdK8xQWJucWZ6RCpU4yKUuK8N 24BJQRAEhmleXBtsEi6xCgrJczLCHSIEE9BalFuZgmq/CtGcQ5GJWHeYyBTeDLzSuCmvwJazA S0+Fwe2OKSRISUVAPjAdFFimuWWuz8c6Qiv+q60xLOKz3yUU1LOmxfbeK4l68QXa7DxdZ0yOI O34VTN1U0dB69fzBzlfHkA4e/3TgsfIPZ6dy3+YtPhtpN3cb2Neuravzdrc9+PZecV7/H9u68 VUJ/L/6rlGdTD/63fRff0st/RJZ7Tp3s8H3fk5X91r+SbEWs5ncLLFFiKc5INNRiLipOBABo9 UbnnwIAAA== X-Env-Sender: prvs=091050e40=Ian.Jackson@citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1476713534!38417344!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: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24608 invoked from network); 17 Oct 2016 14:12:15 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 17 Oct 2016 14:12:15 -0000 X-IronPort-AV: E=Sophos;i="5.31,357,1473120000"; d="scan'208";a="392917277" From: Ian Jackson To: Date: Mon, 17 Oct 2016 15:11:55 +0100 Message-ID: <1476713515-1129-1-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1476712903-968-1-git-send-email-ian.jackson@eu.citrix.com> References: <1476712903-968-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH v2] README: Be less confusing about Tftp settings 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-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ian Jackson CC: Konrad Rzeszutek Wilk --- v2: Give the scope-free version as the basic explanation --- README | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/README b/README index 01c4c96..078888d 100644 --- a/README +++ b/README @@ -390,7 +390,7 @@ HostProp__RebootTimeExtra HostProp__TftpScope Defines the Tftp scope (i.e. subnet) where this host resides. See - "TftpFoo_ and TftpFoo" below. + "TftpFoo_ and TftpFoo" below. The default is "default". HostProp__NtpServer NTP server to use. You should probably have your own local @@ -490,30 +490,36 @@ DebianNonfreeFirmware grep-dctrl (for example because it's not Debian) then you must set this to the empty string, by writing DebianNonfreeFirmware='' -TftpFoo_ and TftpFoo +Tftp* + Settings related to the tftp server: - Describes various properties relating to Tftp in a given , - where a is a given subnet, DHCP server etc. Valid - properties are: - - Path The path to the root of the directory which is exposed by + TftpPath The path to the root of the directory which is exposed by the tftpserver (e.g. /tftpboot). - TmpDir A directory under `Path' to use for temporary files. + TftpTmpDir A directory under `Path' to use for temporary files. - PxeDir The path under `Path' to the PXE configuration directory + TftpPxeDir The path under `Path' to the PXE configuration directory (e.g. pxelinux.cfg) - PxeGroup The Unix group which should own files under `PxeDir'. - PxeTemplates See TftpPxeTemplates - PxeTemplatesReal + TftpPxeGroup The Unix group which should own files under `PxeDir'. + TftpPxeTemplates See TftpPxeTemplates + TftpPxeTemplatesReal - DiBase The path under `Path' to the root of the debian + TftpDiBase The path under `Path' to the root of the debian installer images. - GrubBase The path under `Path' to the root of the grub + TftpGrubBase The path under `Path' to the root of the grub EFI PXE images. - For hosts in scope "default", TftpFoo_default (if set) takes - precedence over TftpFoo. TftpFoo is used when the setting Foo is - not defined for the host's scope. +Tftp_ + + It is possible to have multiple subnets, DHCP servers, tftp + servers, etc. Each one is a , referenced by + HostProp__TftpScope. + + For hosts in scope , Tftp_ (if set) takes + precedence over each Tftp listed above. + + So for hosts in scope "default" (including ones without an + explicit TftpScope) Tftp is used whenever + Tftp_default is not defined. TftpPxeTemplates List (space-separated) of template filenames for writing