[Xen-changelog] [xen master] hotplug/FreeBSD: honour XEN_{LOG, RUN}_DIR

[patchbot@xxxxxxx]

commit 7c64c92a4f689b199661bae834f299ce8ef93f04
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Thu Jun 9 13:57:38 2016 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Fri Jun 10 10:51:51 2016 +0100

    hotplug/FreeBSD: honour XEN_{LOG,RUN}_DIR
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 tools/hotplug/FreeBSD/rc.d/xencommons.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in 
b/tools/hotplug/FreeBSD/rc.d/xencommons.in
index d453c6b..2f9e1ec 100644
--- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
+++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
@@ -18,10 +18,10 @@ status_cmd="xen_status"
 extra_commands="status"
 required_files="/dev/xen/privcmd"
 
-XENSTORED_PIDFILE="/var/run/xenstored.pid"
-XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid"
-#XENCONSOLED_TRACE="/var/log/xen/xenconsole-trace.log"
-#XENSTORED_TRACE="/var/log/xen/xenstore-trace.log"
+XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid"
+XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
+#XENCONSOLED_TRACE="@XEN_LOG_DIR@/xenconsole-trace.log"
+#XENSTORED_TRACE="@XEN_LOG_DIR@/xen/xenstore-trace.log"
 
 xen_precmd()
 {
@@ -43,7 +43,7 @@ xen_startcmd()
                printf "Starting xenservices: xenstored, xenconsoled."
                XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}"
                if [ -n "${XENSTORED_TRACE}" ]; then
-                       XENSTORED_ARGS="${XENSTORED_ARGS} -T 
/var/log/xen/xenstored-trace.log"
+                       XENSTORED_ARGS="${XENSTORED_ARGS} -T 
@XEN_LOG_DIR@/xenstored-trace.log"
                fi
                ${sbindir}/xenstored ${XENSTORED_ARGS}
                while [ $time -lt $timeout ] && ! `${bindir}/xenstore-read -s / 
>/dev/null 2>&1` ; do
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog