Version bump xen-3, now uses udev rules. Add support for screen consoles in xendomains. No longer use broken --halt to bring down domains.

Package-Manager: portage-2.0.53_rc3

8 files changed, 58 insertions, 41 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 4bb6e50a937e..9cd641aa6034 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.5 2005/09/29 17:49:37 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.6 2005/10/08 12:32:33 chrb Exp $
+
+*xen-3.0.0_pre20051007 (08 Oct 2005)
+
+  08 Oct 2005; Chris Bainbridge <chrb@gentoo.org> files/xend-init,
+  files/xendomains-conf, files/xendomains-init,
+  -xen-3.0.0_pre20050929.ebuild, +xen-3.0.0_pre20051007.ebuild:
+  -m Version bump xen-3, now uses udev rules. Add support for screen consoles
+  in xendomains. No longer use broken --halt to bring down domains.
 
 *xen-3.0.0_pre20050929 (29 Sep 2005)
 
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 87f1e5f8bc2e..5431e06bc59a 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,10 +1,10 @@
-MD5 0d37682712702627ec3c0d22459ef110 ChangeLog 1127
+MD5 91f552a9f3f76a5b0137e31c3db26082 ChangeLog 1491
+MD5 6eaea330ed78459069eb5ba608e654dd files/digest-xen-2.0.7 63
+MD5 c9b4ec0d862e7d516ad6793c7240a237 files/digest-xen-3.0.0_pre20051007 75
+MD5 16d372298e94a8eef72c1943b1ed5561 files/xend-conf 347
+MD5 b659e1e802207d647698236ddbc2e7a3 files/xend-init 838
+MD5 11ef318e35fcfed12931f182fc01955a files/xendomains-conf 180
+MD5 a8399d2d398bb05f40dd3e9bf4332af1 files/xendomains-init 1663
 MD5 23ec60d5040f966fda250a47d8903428 metadata.xml 252
 MD5 b25e5ad259e28bab5d8d3b4c0a62d278 xen-2.0.7.ebuild 2853
-MD5 5e545bf8472c987a1ef599ee1607cbe6 xen-3.0.0_pre20050929.ebuild 2618
-MD5 16d372298e94a8eef72c1943b1ed5561 files/xend-conf 347
-MD5 4138fb645ecbd7a003e1bdb284c1b4ca files/xend-init 806
-MD5 9f441f0eaec0c4a04af82df233dadbe0 files/xendomains-conf 22
-MD5 d3326889a8fa0fe52d6f32f1f417fb8d files/xendomains-init 1261
-MD5 d38ecf6f372a40b8efa172162982396d files/digest-xen-3.0.0_pre20050929 75
-MD5 6eaea330ed78459069eb5ba608e654dd files/digest-xen-2.0.7 63
+MD5 fe7ae6018a56e15c91f0cdf8cc4a6436 xen-3.0.0_pre20051007.ebuild 2012
diff --git a/app-emulation/xen/files/digest-xen-3.0.0_pre20050929 b/app-emulation/xen/files/digest-xen-3.0.0_pre20050929
deleted file mode 100644
index c9aba9f40f07..000000000000
--- a/app-emulation/xen/files/digest-xen-3.0.0_pre20050929
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee7039315e8c17d486fcd577ca0696c4 xen-unstable-20050929.tar.bz2 3629841
diff --git a/app-emulation/xen/files/digest-xen-3.0.0_pre20051007 b/app-emulation/xen/files/digest-xen-3.0.0_pre20051007
new file mode 100644
index 000000000000..6181a1e14e72
--- /dev/null
+++ b/app-emulation/xen/files/digest-xen-3.0.0_pre20051007
@@ -0,0 +1 @@
+MD5 4fb82af4348b4fac179a5da6044aea68 xen-unstable-20051007.tar.bz2 3608261
diff --git a/app-emulation/xen/files/xend-init b/app-emulation/xen/files/xend-init
index 118df2d0ab9b..ad0486e52fef 100644
--- a/app-emulation/xen/files/xend-init
+++ b/app-emulation/xen/files/xend-init
@@ -1,13 +1,13 @@
 #!/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/files/xend-init,v 1.2 2005/09/20 08:57:06 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/files/xend-init,v 1.3 2005/10/08 12:32:33 chrb Exp $
 
 opts="start stop status restart"
 
 depend() {
 	need net
-	before xendomain
+	before xendomain sshd ntpd nfs nfsmount rsyncd portmap
 }
 
 await_daemons_up() {
@@ -27,8 +27,8 @@ start() {
 
 stop() {
 	if [ "$(xm list | wc -l)" -gt 2 ]; then
-		ebegin "  Stopping all domain"
-		/usr/sbin/xm shutdown --all --halt --wait >/dev/null
+		ebegin "  Stopping all domains"
+		/usr/sbin/xm shutdown --all --wait >/dev/null
 		eend $?
 	fi
 
diff --git a/app-emulation/xen/files/xendomains-conf b/app-emulation/xen/files/xendomains-conf
index e22906b673a2..bbc8ff6c3b0d 100644
--- a/app-emulation/xen/files/xendomains-conf
+++ b/app-emulation/xen/files/xendomains-conf
@@ -1 +1,6 @@
+# Directory of domain configs to automatically boot
 AUTODIR=/etc/xen/auto
+
+# set to yes to run all auto 'xm create's in screen
+# with logging to /var/log/xen-consoles/
+SCREEN="no"
diff --git a/app-emulation/xen/files/xendomains-init b/app-emulation/xen/files/xendomains-init
index f9bdeb3474ad..afc796c9367a 100644
--- a/app-emulation/xen/files/xendomains-init
+++ b/app-emulation/xen/files/xendomains-init
@@ -1,7 +1,7 @@
 #!/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/files/xendomains-init,v 1.2 2005/09/20 08:57:06 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/files/xendomains-init,v 1.3 2005/10/08 12:32:33 chrb Exp $
 
 opts="start stop status restart"
 
@@ -18,13 +18,25 @@ is_running() {
 }
 
 start() {
-	einfo "Starting ${AUTODIR} auto Xen domains"
+	einfo "Starting ${AUTODIR} Xen domains"
+	if [[ ${SCREEN} == "yes" ]]; then
+		screen -d -m -S xen -t xen-cbc0
+		screen -r xen -X zombie dr
+		logrotate -f /usr/share/xen/xen-consoles-logrotate
+		screen -r xen -X logfile /var/log/xen-consoles/%t
+		screen -r xen -X logfile flush 1
+		screen -r xen -X deflog on
+	fi
 	# Create all domains with config files in AUTODIR.
 	for dom in $(ls ${AUTODIR}/* 2>/dev/null); do
 		name=$(get_domname ${dom})
 		if ! is_running ${name} ; then
 			ebegin "  Starting domain ${name}"
-			/usr/sbin/xm create --quiet --defconfig ${dom}
+			if [[ ${SCREEN} == "yes" ]]; then
+				screen -r xen -X screen -t ${name} xm create ${dom} -c
+			else
+				xm create --quiet ${dom}
+			fi
 			eend $?
 		else
 			einfo "  Not Starting domain ${name} - allready running"
@@ -39,12 +51,15 @@ stop() {
 		name=$(get_domname ${dom})
 		if is_running ${name} ; then
 			ebegin "  Stopping domain ${name}"
-			/usr/sbin/xm shutdown --halt --wait ${name} >/dev/null
+				xm shutdown --wait ${name} >/dev/null
 			eend $?
 		else
 			einfo "  Not Stopping domain ${name} - not running"
 		fi
 	done
+	if [[ ${SCREEN} == "yes" ]]; then
+		screen -r xen -X quit
+	fi
 }
 
 status() {
diff --git a/app-emulation/xen/xen-3.0.0_pre20050929.ebuild b/app-emulation/xen/xen-3.0.0_pre20051007.ebuild
index 0b84bd07651b..9b59f8d1c2e6 100644
--- a/app-emulation/xen/xen-3.0.0_pre20050929.ebuild
+++ b/app-emulation/xen/xen-3.0.0_pre20051007.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.0_pre20050929.ebuild,v 1.1 2005/09/29 17:49:37 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.0_pre20051007.ebuild,v 1.1 2005/10/08 12:32:33 chrb Exp $
 
 inherit mount-boot
 
 DESCRIPTION="The Xen virtual machine monitor and Xend daemon"
 HOMEPAGE="http://xen.sourceforge.net"
-DATE="20050929"
+DATE="20051007"
 SRC_URI="mirror://gentoo/xen-unstable-${DATE}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="doc debug"
+IUSE="doc debug screen"
 
 DEPEND="sys-apps/iproute2
 	net-misc/bridge-utils
@@ -22,6 +22,10 @@ DEPEND="sys-apps/iproute2
 	doc? (
 		dev-tex/latex2html
 		media-gfx/transfig
+	)
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
 	)"
 
 S="${WORKDIR}/xen-unstable-${DATE}"
@@ -65,27 +69,12 @@ src_install() {
 	newconfd ${FILESDIR}/xendomains-conf xendomains
 	newinitd ${FILESDIR}/xendomains-init xendomains
 
-	# install kernel source patches
-	dodir /usr/share/xen/patches
-	rm patches/linux-2.6.12/patch-2.6.12.5
-	cd patches
-	for x in *; do tar -jcvf ${D}/usr/share/xen/patches/${x}.tar.bz2 ${x}/; done
-	cd ..
-
-	# we need to do whatever mkbuildtree would've done for each platform
-	# linux-2.6: copy public include files, and xenstored.h
-	mkdir linux-2.6-xen-sparse/include/asm-xen/xen-public
-	rm xen/include/public/COPYING
-	cp -dpPR xen/include/public/* linux-2.6-xen-sparse/include/asm-xen/xen-public
-	cp -dpP tools/xenstore/xenstored.h linux-2.6-xen-sparse/include/asm-xen/linux-public
-	# fixme: insert code for other sparse trees here
-
-	# install xen kernel sparse trees
-	for x in *-xen-sparse; do
-	    if [ -e ${x}/mkbuildtree ]; then rm ${x}/mkbuildtree; fi
-	    tar -jcvf ${D}/usr/share/xen/${x}.tar.bz2 -C ${x} .
-	done
+	# for upstream change tracking
+	dodoc ${S}/XEN-VERSION
 
+	if use screen; then
+		sed -i -e 's/SCREEN="no"/SCREEN="yes"/' ${D}/etc/init.d/xendomains
+	fi
 }
 
 pkg_postinst() {