From: Wei Liu <wei.liu2@citrix.com>
Date: Mon, 13 Jun 2016 07:49:09 +0000 (+0100)
Subject: hotplug/Linux: honour XEN_RUN_STORED
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~924
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba53cec7cde17d534c96ab7db2ca3df047c1296b;p=xen.git

hotplug/Linux: honour XEN_RUN_STORED

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/hotplug/Linux/systemd/xenstored.socket.in b/tools/hotplug/Linux/systemd/xenstored.socket.in
index 2e8ee04ecf..375c4b7a20 100644
--- a/tools/hotplug/Linux/systemd/xenstored.socket.in
+++ b/tools/hotplug/Linux/systemd/xenstored.socket.in
@@ -5,7 +5,7 @@ After=proc-xen.mount var-lib-xenstored.mount
 ConditionPathExists=/proc/xen/capabilities
 
 [Socket]
-ListenStream=/var/run/xenstored/socket
+ListenStream=@XEN_RUN_STORED@/socket
 SocketMode=0600
 Service=xenstored.service
 
diff --git a/tools/hotplug/Linux/systemd/xenstored_ro.socket.in b/tools/hotplug/Linux/systemd/xenstored_ro.socket.in
index 140ad94d3b..82fe377cb9 100644
--- a/tools/hotplug/Linux/systemd/xenstored_ro.socket.in
+++ b/tools/hotplug/Linux/systemd/xenstored_ro.socket.in
@@ -5,7 +5,7 @@ After=proc-xen.mount var-lib-xenstored.mount
 ConditionPathExists=/proc/xen/capabilities
 
 [Socket]
-ListenStream=/var/run/xenstored/socket_ro
+ListenStream=@XEN_RUN_STORED@/socket_ro
 SocketMode=0660
 Service=xenstored.service