From patchwork Tue Apr 18 15:31:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9685611 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 AFAE560375 for ; Tue, 18 Apr 2017 15:34:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2C9922638 for ; Tue, 18 Apr 2017 15:34:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97B352815E; Tue, 18 Apr 2017 15:34:44 +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 80E7822638 for ; Tue, 18 Apr 2017 15:34:42 +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 1d0V73-0006Xz-08; Tue, 18 Apr 2017 15:32: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 1d0V71-0006Wu-DE for xen-devel@lists.xenproject.org; Tue, 18 Apr 2017 15:32:15 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id 55/8E-02956-E7136F85; Tue, 18 Apr 2017 15:32:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHRDpG6d4bc IgwVTRCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyOqQ+ZCk5yV0xo62ZuYGzk6mLk5JAQ8Jd4 vnIqM4jNJqAs8bOzlw3EFhHQk2g68Jyxi5GLg1mggUni0psdjCAJYQEXiaNrN7CD2CwCqhJ/T r1i6mLk4OAVsJA4uZEDYqa8xK62i6wgNqeApcSv26/BWoWASu4++88CYStIdEw/xgRi8woISp yc+QQsziwgIXHwxQvmCYy8s5CkZiFJLWBkWsWoUZxaVJZapGtkrJdUlJmeUZKbmJmja2hgppe bWlycmJ6ak5hUrJecn7uJERg8DECwg/HP/MBDjJIcTEqivL8svkYI8SXlp1RmJBZnxBeV5qQW H2KU4eBQkuBlMfgWISRYlJqeWpGWmQMMY5i0BAePkgivIkiat7ggMbc4Mx0idYpRl+PQ85/vm YRY8vLzUqXEeaNBigRAijJK8+BGwGLqEqOslDAvI9BRQjwFqUW5mSWo8q8YxTkYlYR5jUGm8G TmlcBtegV0BBPQEREBX0COKElESEk1MBpo1XGdb22+//jloonlm3pumJYpqty6FxXxJ89+7+I pdyqneugmVa8OuLV01pd7TgX/GFvMTMKMHU889tcrbMu7x39o95aWvo0vfbMbbj7OmzvjVWl/ IvN9P8VYTv8gpe+v+lYphz/xVmdMcvqV/eRxuM+COQFeLJsKujac8FuYuFvd/3DcASWW4oxEQ y3mouJEALnW5NakAgAA X-Env-Sender: prvs=27401045f=wei.liu2@citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1492529531!57530365!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3903 invoked from network); 18 Apr 2017 15:32:14 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 18 Apr 2017 15:32:14 -0000 X-IronPort-AV: E=Sophos;i="5.37,219,1488844800"; d="scan'208";a="419652444" From: Wei Liu To: Xen-devel Date: Tue, 18 Apr 2017 16:31:44 +0100 Message-ID: <20170418153144.28930-4-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170418153144.28930-1-wei.liu2@citrix.com> References: <20170418153144.28930-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Wei Liu , Jonathan.Ludlam@citrix.com, Ian Jackson , Julien Grall , christian.lindig@citrix.com, dave@recoil.org, =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH for-4.9 v2 3/3] hotplug/FreeBSD: configure xenstored 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é --- tools/hotplug/FreeBSD/rc.d/xencommons.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 2fcd84ab6d..ccd5a9b055 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -3,6 +3,8 @@ # PROVIDE: xencommons # REQUIRE: DAEMON +XENSTORED=@XENSTORED@ + . /etc/rc.subr . @XEN_SCRIPT_DIR@/hotplugpath.sh @@ -37,7 +39,7 @@ xen_startcmd() local time=0 local timeout=30 - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${XENSTORED}) if test -z "$xenstored_pid"; then printf "Cleaning xenstore database.\n" if [ -z "${XENSTORED_ROOTDIR}" ]; then @@ -49,7 +51,7 @@ xen_startcmd() if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T @XEN_LOG_DIR@/xenstored-trace.log" fi - ${sbindir}/xenstored ${XENSTORED_ARGS} + ${XENSTORED} ${XENSTORED_ARGS} while [ $time -lt $timeout ] && ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) @@ -87,7 +89,7 @@ xen_stop() xen_status() { - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${XENSTORED}) if test -n ${xenstored_pid}; then pids="$pids $xenstored_pid" fi