From 0c1a7ec882e9517be15de344e98814956307069a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 4 Jun 2013 17:32:55 +0200
Subject: [PATCH] xen: preserve xendomains script; update systemd services with
 new path.

---
 srcpkgs/xen/files/xenconsoled.service | 2 +-
 srcpkgs/xen/files/xendomU@.service    | 4 ++--
 srcpkgs/xen/files/xenstored.service   | 2 +-
 srcpkgs/xen/template                  | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xen/files/xenconsoled.service b/srcpkgs/xen/files/xenconsoled.service
index edcc8e69fb5..6902e5027d3 100644
--- a/srcpkgs/xen/files/xenconsoled.service
+++ b/srcpkgs/xen/files/xenconsoled.service
@@ -12,7 +12,7 @@ Environment=XENCONSOLED_LOG_DIR=/var/log/xen/console
 EnvironmentFile=-/etc/conf.d/xenconsoled
 PIDFile=/var/run/xenconsoled.pid
 ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
+ExecStart=/usr/bin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/xen/files/xendomU@.service b/srcpkgs/xen/files/xendomU@.service
index 57d6e520df7..b3dd6c7d7d3 100644
--- a/srcpkgs/xen/files/xendomU@.service
+++ b/srcpkgs/xen/files/xendomU@.service
@@ -5,8 +5,8 @@ Requires=xenstored.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/sbin/xl create /etc/xen/conf/%i.cfg
-ExecStop=/usr/sbin/xl shutdown %i
+ExecStart=/usr/bin/xl create /etc/xen/conf/%i.cfg
+ExecStop=/usr/bin/xl shutdown %i
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/xen/files/xenstored.service b/srcpkgs/xen/files/xenstored.service
index c898fd24bfa..2bba29a16ff 100644
--- a/srcpkgs/xen/files/xenstored.service
+++ b/srcpkgs/xen/files/xenstored.service
@@ -12,7 +12,7 @@ Environment=XENSTORED_ARGS=
 EnvironmentFile=-/etc/conf.d/xenstored
 PIDFile=/var/run/xenstored.pid
 ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
+ExecStart=/usr/bin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
 ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0"
 
 [Install]
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 76fc758bb36..723bb278923 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -55,6 +55,8 @@ do_install() {
 	mv ${DESTDIR}/etc/xen/x*example* ${DESTDIR}/usr/share/examples/xen
 	mv ${DESTDIR}/etc/xen/cpupool ${DESTDIR}/usr/share/examples/xen
 
+	mv ${DESTDIR}/etc/init.d/xendomains ${DESTDIR}/etc/xen/scripts
+
 	# Remove useless stuff.
 	rm -rf ${DESTDIR}/etc/init.d ${DESTDIR}/usr/local
 	rm -f ${DESTDIR}/install.sh ${DESTDIR}/usr/lib64