Added xendomains.confd to start of xendomains-screen.confd suggested in Bug #455622, edited xendomains.initd-r2 wrt suggestion from Bug #455626, fixes both bugs by Tomas Mozes

(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

4 files changed, 21 insertions, 5 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index d850101f56c5..9a3bd12b98a1 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.134 2013/02/03 21:36:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.135 2013/02/09 07:14:00 idella4 Exp $
+
+  09 Feb 2013; Ian Delaney <idella4@gentoo.org> files/xendomains-screen.confd,
+  files/xendomains.initd-r2, xen-tools-4.2.1-r1.ebuild:
+  Added xendomains.confd to start of xendomains-screen.confd suggested in Bug
+  #455622, edited xendomains.initd-r2 wrt suggestion from Bug #455626, fixes
+  both bugs by Tomas Mozes
 
   03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> -xen-tools-4.1.1-r6.ebuild,
   -xen-tools-4.1.2-r3.ebuild, -xen-tools-4.2.0-r2.ebuild:
diff --git a/app-emulation/xen-tools/files/xendomains-screen.confd b/app-emulation/xen-tools/files/xendomains-screen.confd
index 1482c0a25041..a180c13d85db 100644
--- a/app-emulation/xen-tools/files/xendomains-screen.confd
+++ b/app-emulation/xen-tools/files/xendomains-screen.confd
@@ -1,3 +1,13 @@
+# /etc/conf.d/xendomains
+
+# Directory of domains to boot. AUTODIR should contain one or more symlinks
+# to domain config files in /etc/xen
+AUTODIR=/etc/xen/auto
+
+# Send shutdown commands to all domains in parallel instead of waiting for
+# each to shutdown individually
+PARALLEL_SHUTDOWN=yes
+
 # When SCREEN="yes", domains in AUTODIR have their consoles connected to a
 # screen session named SCREEN_NAME, with output logged to individual files 
 # named after each domain and written to /var/log/xen-consoles/ . These files
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index 5113ae627be2..e88e576126d8 100644
--- a/app-emulation/xen-tools/files/xendomains.initd-r2
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.4 2012/01/12 13:40:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.5 2013/02/09 07:14:00 idella4 Exp $
 
 opts="start stop status restart"
 
@@ -39,6 +39,7 @@ start() {
 	if using_screen ; then
 		ebegin "Creating screen session to hold domain consoles"
 		(  screen -c ${SCREENRC:-/dev/null} -d -m -S ${SCREEN_NAME} -t dom0 \
+		&& sleep 5 \
 		&& ${screen_cmd} zombie dr \
 		&& logrotate -f /etc/xen/xen-consoles.logrotate \
 		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
index 9d281472f945..2a0151404f1f 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild,v 1.3 2013/02/01 13:24:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild,v 1.4 2013/02/09 07:14:00 idella4 Exp $
 
 EAPI=5
 
@@ -32,7 +32,6 @@ DOCS=( README docs/README.xen-bugtool )
 
 LICENSE="GPL-2"
 SLOT="0"
-# TODO soon; ocaml up for a potential name change
 IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
 
 REQUIRED_USE="hvm? ( qemu )"