[Xen-changelog] [xen master] hotplug/FreeBSD: configure xenstored

[patchbot@xxxxxxx]

commit f9e2600ea107bf408a2778f456bd1beee29ce3c1
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Tue Apr 18 15:48:59 2017 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Thu Apr 20 12:02:59 2017 +0100

    hotplug/FreeBSD: configure xenstored
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Release-acked-by: Julien Grall <julien.grall@xxxxxxx>
---
 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 2fcd84a..ccd5a9b 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog