From c6a20560b6691d331efa1b288e06b1691605b1a5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 13 Oct 2014 11:58:10 +0200
Subject: [PATCH] xen: added runit-services.

---
 srcpkgs/xen/files/xen/run               | 5 +++++
 srcpkgs/xen/files/xen/supervise         | 1 +
 srcpkgs/xen/files/xenconsoled/run       | 3 +++
 srcpkgs/xen/files/xenconsoled/supervise | 1 +
 srcpkgs/xen/files/xenstored/run         | 6 ++++++
 srcpkgs/xen/files/xenstored/supervise   | 1 +
 srcpkgs/xen/template                    | 8 +++++++-
 7 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/xen/files/xen/run
 create mode 120000 srcpkgs/xen/files/xen/supervise
 create mode 100755 srcpkgs/xen/files/xenconsoled/run
 create mode 120000 srcpkgs/xen/files/xenconsoled/supervise
 create mode 100755 srcpkgs/xen/files/xenstored/run
 create mode 120000 srcpkgs/xen/files/xenstored/supervise

diff --git a/srcpkgs/xen/files/xen/run b/srcpkgs/xen/files/xen/run
new file mode 100755
index 00000000000..8e6c60b2a58
--- /dev/null
+++ b/srcpkgs/xen/files/xen/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+sv check xenstored >/dev/null || exit 1
+xenstore-write "/local/domain/0/domid" 0 || exit 1
+xenstore-write "/local/domain/0/name" "Domain-0" || exit 1
+exec chpst -b xen pause
diff --git a/srcpkgs/xen/files/xen/supervise b/srcpkgs/xen/files/xen/supervise
new file mode 120000
index 00000000000..2e174a22877
--- /dev/null
+++ b/srcpkgs/xen/files/xen/supervise
@@ -0,0 +1 @@
+/run/runit/supervise.xen
\ No newline at end of file
diff --git a/srcpkgs/xen/files/xenconsoled/run b/srcpkgs/xen/files/xenconsoled/run
new file mode 100755
index 00000000000..c26b31bc1f4
--- /dev/null
+++ b/srcpkgs/xen/files/xenconsoled/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+sv check xenstored >/dev/null || exit 1
+exec xenconsoled -i --log=all
diff --git a/srcpkgs/xen/files/xenconsoled/supervise b/srcpkgs/xen/files/xenconsoled/supervise
new file mode 120000
index 00000000000..bb53002545a
--- /dev/null
+++ b/srcpkgs/xen/files/xenconsoled/supervise
@@ -0,0 +1 @@
+/run/runit/supervise.xenconsoled
\ No newline at end of file
diff --git a/srcpkgs/xen/files/xenstored/run b/srcpkgs/xen/files/xenstored/run
new file mode 100755
index 00000000000..8f750a536aa
--- /dev/null
+++ b/srcpkgs/xen/files/xenstored/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ ! -d /run/xen ] && mkdir -p /run/xen
+mount -t xenfs xenfs /proc/xen || exit 1
+mount -t tmpfs xenstored /var/lib/xenstored || exit 1
+grep -q control_d /proc/xen/capabilities || exit 1
+exec xenstored --verbose --no-fork
diff --git a/srcpkgs/xen/files/xenstored/supervise b/srcpkgs/xen/files/xenstored/supervise
new file mode 120000
index 00000000000..a8d637e2966
--- /dev/null
+++ b/srcpkgs/xen/files/xenstored/supervise
@@ -0,0 +1 @@
+/run/runit/supervise.xenstored
\ No newline at end of file
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 604642f5fa4..124398b7a9f 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -2,7 +2,7 @@
 pkgname=xen
 version=4.4.1
 wrksrc=xen-${version}
-revision=2
+revision=3
 short_desc="The Xen hypervisor utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xen.org"
@@ -19,6 +19,7 @@ makedepends="
  ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel
  dev86 acpica-utils pixman-devel gcc-multilib"
 depends="iproute2 bridge-utils xen-hypervisor"
+replaces="runit-void<20141013_2"
 
 build_options="systemd"
 make_dirs="
@@ -107,6 +108,11 @@ do_install() {
 	rm -f ${DESTDIR}/usr/share/doc/xen/html/man/xm.1.html
 	rm -f ${DESTDIR}/usr/share/doc/xen/html/man/{xmdomain.cfg,xend-config.sxp}.5.html
 	rm -f ${DESTDIR}/usr/share/examples/xen/xmexample*
+
+	# runit services
+	vsv xen
+	vsv xenconsoled
+	vsv xenstored
 }
 
 xen-hypervisor_package() {