From patchwork Thu Jun 9 12:57:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9166955 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 061616048F for ; Thu, 9 Jun 2016 12:59:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB0AE21BED for ; Thu, 9 Jun 2016 12:59:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E004228340; Thu, 9 Jun 2016 12:59:39 +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 7C5DB21BED for ; Thu, 9 Jun 2016 12:59:39 +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 1bAzWu-0000RP-Nd; Thu, 09 Jun 2016 12:57:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAzWu-0000OY-3S for xen-devel@lists.xenproject.org; Thu, 09 Jun 2016 12:57:48 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 10/CA-13025-BC769575; Thu, 09 Jun 2016 12:57:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsXitHSDve6p9Mh wg+bNJhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bm6fvZC44JVOzdfomxgfEFXxcjJ4eEgL/E x3N/mEBsNgFliZ+dvWwgtoiAnkTTgeeMXYxcHMwCHYwSPdPms4IkhAUsJPbt/QFmswioSHxoW 8kIYvMKOEus2TCREWKonMT54z+Zuxg5ODgFXCQadjmBhIWAStq7PjJDlAtKnJz5hAXEZhbQlG jd/psdwpaXaN46mxmiXkGiY/oxJpAxEgLcEn+77Scw8s9C0j0LSfcsJN0LGJlXMaoXpxaVpRb pmuslFWWmZ5TkJmbm6BoamOrlphYXJ6an5iQmFesl5+duYgQGIAMQ7GA8Ntn5EKMkB5OSKO8T 68hwIb6k/JTKjMTijPii0pzU4kOMMhwcShK8k9KAcoJFqempFWmZOcBYgElLcPAoifAeAUnzF hck5hZnpkOkTjEqSonzJoAkBEASGaV5cG2w+LvEKCslzMsIdIgQT0FqUW5mCar8K0ZxDkYlYd 4rIFN4MvNK4Ka/AlrMBLR4+ZFwkMUliQgpqQZGnl3py2K3zZr6/bXL95f/Xvj9m7kqpzP7Xf3 xiQd7glyWP77I219+074vy+jvW42tPBZHv77ifF9ut+V9G/tVTduWG6902z+2bfQXL77E8Kap vSrlyt/E6t0mB9UX1796rNgWp5ibve6OYLhVzuaPC1cWPdu9y1E7YerKCmN2wfyzW31y3h/0V GIpzkg01GIuKk4EAL4h3CC6AgAA X-Env-Sender: prvs=9619a384d=wei.liu2@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1465477063!43850538!3 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 6006 invoked from network); 9 Jun 2016 12:57:46 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Jun 2016 12:57:46 -0000 X-IronPort-AV: E=Sophos;i="5.26,444,1459814400"; d="scan'208";a="366239479" From: Wei Liu To: Xen-devel Date: Thu, 9 Jun 2016 13:57:39 +0100 Message-ID: <1465477062-28805-9-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465477062-28805-1-git-send-email-wei.liu2@citrix.com> References: <1465477062-28805-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Wei Liu , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH 08/11] hotplug/Linux: honour XEN_LOG_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 Signed-off-by: Wei Liu Acked-by: Roger Pau Monné Acked-by: Ian Jackson --- Cc: Ian Jackson Cc: Roger Pau Monné --- tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 2 +- tools/hotplug/Linux/init.d/xencommons.in | 2 +- tools/hotplug/Linux/xen-hotplug-common.sh.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in index acc7309..c27a476 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -24,7 +24,7 @@ ## Default: "" # # Additional commandline arguments to start xenstored, -# like "--trace-file /var/log/xen/xenstored-trace.log" +# like "--trace-file @XEN_LOG_DIR@/xenstored-trace.log" # See "@sbindir@/xenstored --help" for possible options. XENSTORED_ARGS= diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index eeac8ab..7b69fc2 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -66,7 +66,7 @@ do_start () { then test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="@XEN_LIB_STORED@" rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null - test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" + test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T @XEN_LOG_DIR@/xenstored-trace.log" if [ -n "$XENSTORED" ] ; then echo -n Starting $XENSTORED... diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in index d5d0b69..8c2cb9e 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh.in +++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in @@ -20,7 +20,7 @@ dir=$(dirname "$0") . "$dir/xen-script-common.sh" . "$dir/locking.sh" -exec 2>>/var/log/xen/xen-hotplug.log +exec 2>>@XEN_LOG_DIR@/xen-hotplug.log export PATH="${bindir}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" export LD_LIBRARY_PATH="${libdir}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH"