xend should start before ntp-client (bug #144057).

svn path=/; revision=19

3 files changed, 51 insertions, 9 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index feec04d..3955a13 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -26,6 +26,10 @@ AUX xend-init 854 RMD160 e19cc95563c3e128255f3575297bc0d35786b5a4 SHA1 820fa00dd
 MD5 b8d59e2eba1f6b245eb22e39c01df78c files/xend-init 854
 RMD160 e19cc95563c3e128255f3575297bc0d35786b5a4 files/xend-init 854
 SHA256 3991a74268dd4bc8b6fe53ed784f3cd764eb7112844dee34f3115bcd15d33377 files/xend-init 854
+AUX xend.initd 865 RMD160 1e2b7333bb4622ed17af5a74f958dce945fff09d SHA1 a9e6bc64725dd3ca28ccfff404df9307e1302f3d SHA256 896695341b73be52dc7a200bf706e6dc575ae6bfec10ad1b461a1610c008f76e
+MD5 6b8e6dc37420417c11268227ea5d8ff1 files/xend.initd 865
+RMD160 1e2b7333bb4622ed17af5a74f958dce945fff09d files/xend.initd 865
+SHA256 896695341b73be52dc7a200bf706e6dc575ae6bfec10ad1b461a1610c008f76e files/xend.initd 865
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
 MD5 65a57a4fae5a300aed8b84c24cdeee42 files/xendomains-screen.confd 594
 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 files/xendomains-screen.confd 594
@@ -43,14 +47,10 @@ EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f
 MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530
 RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530
 SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530
-EBUILD xen-tools-3.0.2-r4.ebuild 5292 RMD160 e9336962c7ac321da04412f624072b2506a3a74f SHA1 78de6eea547944b7c470fb2375b8df2f8db09e3b SHA256 c4d204b8a667107d880c4cac2eb1e72da1d20cb3e11df7f51bc79e03d8a77aa4
-MD5 69f78dd22a8fdf2c65827f260ef99272 xen-tools-3.0.2-r4.ebuild 5292
-RMD160 e9336962c7ac321da04412f624072b2506a3a74f xen-tools-3.0.2-r4.ebuild 5292
-SHA256 c4d204b8a667107d880c4cac2eb1e72da1d20cb3e11df7f51bc79e03d8a77aa4 xen-tools-3.0.2-r4.ebuild 5292
-MISC xen-tools-3.0.2-r4.ebuild.orig 4917 RMD160 8cb659aa71e621eae6a301b8af7c9be9ab5c0546 SHA1 707c128f5352162d8a47a8ce7276e54226e59389 SHA256 2eac0376528c9bb83839c76d7bdade41780201e1c7b6114e4d3598edf49edd86
-MD5 7688d84246e23bb5111806fea413e405 xen-tools-3.0.2-r4.ebuild.orig 4917
-RMD160 8cb659aa71e621eae6a301b8af7c9be9ab5c0546 xen-tools-3.0.2-r4.ebuild.orig 4917
-SHA256 2eac0376528c9bb83839c76d7bdade41780201e1c7b6114e4d3598edf49edd86 xen-tools-3.0.2-r4.ebuild.orig 4917
+EBUILD xen-tools-3.0.2-r4.ebuild 5293 RMD160 7576bf11b7324a6b744db3cbf63a4ce5463d0934 SHA1 90ac80366cec3baff441834bcc946276df48b6a5 SHA256 5f2c8906df549e2e2723ab2ee8c76efefba706268aa2e802754f13e44b784438
+MD5 5d7b6da3e73ebbded6c78eb1e97238e7 xen-tools-3.0.2-r4.ebuild 5293
+RMD160 7576bf11b7324a6b744db3cbf63a4ce5463d0934 xen-tools-3.0.2-r4.ebuild 5293
+SHA256 5f2c8906df549e2e2723ab2ee8c76efefba706268aa2e802754f13e44b784438 xen-tools-3.0.2-r4.ebuild 5293
 MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r3 235
 RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r3 235
 SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r3 235
diff --git a/app-emulation/xen-tools/files/xend.initd b/app-emulation/xen-tools/files/xend.initd
new file mode 100644
index 0000000..c1af7c1
--- /dev/null
+++ b/app-emulation/xen-tools/files/xend.initd
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend-init,v 1.1 2006/03/24 23:55:01 agriffis Exp $
+
+opts="start stop status restart"
+
+depend() {
+	need net
+	before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+}
+
+await_daemons_up() {
+	for ((i=0; i<5; i++)); do
+		sleep 1
+		/usr/sbin/xend status && return 0
+	done
+	return 1
+}
+
+start() {
+	ebegin "Starting Xen control daemon"
+	/usr/sbin/xend start
+	/usr/sbin/xend status || await_daemons_up
+	eend $?
+}
+
+stop() {
+	if [ "$(xm list | wc -l)" -gt 2 ]; then
+		ebegin "  Stopping all domains"
+		/usr/sbin/xm shutdown --all --wait >/dev/null
+		eend $?
+	fi
+
+	ebegin "Stopping Xen control daemon"
+	/usr/sbin/xend stop
+	eend $?
+}
+
+status() {
+	/usr/sbin/xend status
+}
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
index 349e066..0364cd6 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
@@ -154,7 +154,7 @@ src_install() {
 
 	doman docs/man?/*
 
-	newinitd "${FILESDIR}"/xend-init xend
+	newinitd "${FILESDIR}"/xend.initd xend
 	newconfd "${FILESDIR}"/xendomains.confd xendomains
 	newinitd "${FILESDIR}"/xendomains.initd xendomains