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

(Portage version: 2.0.53_rc3)

5 files changed, 29 insertions, 9 deletions

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() {