From patchwork Wed Jun 15 11:15:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9178183 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 D4C9F604DB for ; Wed, 15 Jun 2016 11:17:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C470F27F48 for ; Wed, 15 Jun 2016 11:17:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B90A9281FE; Wed, 15 Jun 2016 11:17:28 +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 49D1F27F48 for ; Wed, 15 Jun 2016 11:17:28 +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 1bD8nK-0004el-T3; Wed, 15 Jun 2016 11:15:38 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bD8nJ-0004c9-3v for xen-devel@lists.xenproject.org; Wed, 15 Jun 2016 11:15:37 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 92/27-06230-8D831675; Wed, 15 Jun 2016 11:15:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRWlGSWpSXmKPExsXitHSDve51i8R wg64fWhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aH2R/YCzawVXQ0nWRsYDzI2sXIySEh4C9x 4cVsRhCbTUBZ4mdnLxuILSKgJ9F04DlYnFkgU+LyzNXMILawgLHE7YuX2EFsFgFViVW73oHV8 wo4S3Tt+cMGMVNO4vzxn2D1nAIuEv9/t4HNEQKqufztFhuErSDRMf0YE0SvoMTJmU9YIHZJSB x88YIZYg63xO3TU5knMPLNQlI2C0nZAkamVYzqxalFZalFuoZ6SUWZ6RkluYmZObqGBmZ6uan FxYnpqTmJScV6yfm5mxiBIcUABDsYdz53OsQoycGkJMrrIZcYLsSXlJ9SmZFYnBFfVJqTWnyI UYaDQ0mCN8gcKCdYlJqeWpGWmQMMbpi0BAePkgivL0iat7ggMbc4Mx0idYpRl2PBj9trmYRY8 vLzUqXEIWYIgBRllObBjYBF2iVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ8yaBTOHJzCuB2/ QK6AgmoCNspseDHFGSiJCSamBUjjd0fG+35NJN3uiF3y7WlT4S/lTEFRd45bbO2/KoYrvJKue WX31xM3t6maXRtRWmx67X7Jrvk+17uq7iQdOePO+/0UE/fazdjBP/fv5w6KCNMNfXz/8mGBQt muwhqpCxtyP+26KA02+v7Tv9f1Gt6v5FKTurStalreG603tKzkFtketh02JfJZbijERDLeai4 kQAIA/2w68CAAA= X-Env-Sender: prvs=967af9503=wei.liu2@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1465989331!18963606!4 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: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43672 invoked from network); 15 Jun 2016 11:15:35 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 15 Jun 2016 11:15:35 -0000 X-IronPort-AV: E=Sophos;i="5.26,475,1459814400"; d="scan'208";a="367424201" From: Wei Liu To: Xen-devel Date: Wed, 15 Jun 2016 12:15:09 +0100 Message-ID: <1465989309-12418-8-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465989309-12418-1-git-send-email-wei.liu2@citrix.com> References: <1465989309-12418-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson , Wei Liu , Dave Scott Subject: [Xen-devel] [PATCH 7/7] oxenstored: honour XEN_RUN_DIR 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 Move default the pid file under XEN_RUN_DIR. Note that it changes the location from /var/run to /var/run/xen. Signed-off-by: Wei Liu Acked-by: David Scott Acked-by: Ian Jackson --- Cc: Ian Jackson Cc: Dave Scott --- tools/ocaml/xenstored/xenstored.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 30570ed..7ea4026 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -81,7 +81,7 @@ let config_filename cf = | Some name -> name | None -> Define.default_config_dir ^ "/oxenstored.conf" -let default_pidfile = "/var/run/xenstored.pid" +let default_pidfile = Paths.xen_run_dir ^ "/xenstored.pid" let ring_scan_interval = ref 20