[app-emulation/xen-tools] Uncomment xl settings, fix bug 370817, adjust init.d scripts to work for xl; Thanks to Ian Delaney aka idella4

(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)

4 files changed, 20 insertions, 7 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index e80f33af7719..85fd76243feb 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.81 2011/09/05 20:41:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.82 2011/09/10 17:22:46 alexxy Exp $
+
+*xen-tools-4.1.1-r2 (10 Sep 2011)
+
+  10 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.1-r1.ebuild,
+  +xen-tools-4.1.1-r2.ebuild, files/xend.initd-r2, files/xendomains.initd-r2:
+  Uncomment xl settings, fix bug 370817, adjust init.d scripts to work for xl;
+  Thanks to Ian Delaney aka idella4
 
   05 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r1.ebuild,
   metadata.xml:
diff --git a/app-emulation/xen-tools/files/xend.initd-r2 b/app-emulation/xen-tools/files/xend.initd-r2
index b377182f8f2c..b790e7fe4205 100644
--- a/app-emulation/xen-tools/files/xend.initd-r2
+++ b/app-emulation/xen-tools/files/xend.initd-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.1 2011/04/05 21:25:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.2 2011/09/10 17:22:46 alexxy Exp $
 
 opts="start stop status restart"
 
@@ -38,7 +38,7 @@ start() {
 stop() {
 	if [ "$(xm list | wc -l)" -gt 2 ]; then
 		ebegin "  Stopping all domains"
-		/usr/sbin/xl shutdown --all --wait >/dev/null
+		/usr/sbin/xl shutdown -a -w >/dev/null
 		eend $?
 	fi
 
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index 04eee2297b24..9240376cc7dc 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-2011 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.1 2011/04/05 21:25:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.2 2011/09/10 17:22:46 alexxy Exp $
 
 opts="start stop status restart"
 
@@ -81,7 +81,7 @@ stop() {
 			name=$(get_domname ${dom})
 			if is_running ${name} ; then
 				ebegin "  Asking domain ${name} to shutdown in the background..."
-				xl shutdown --wait ${name} >/dev/null &
+				xl shutdown -w ${name} >/dev/null &
 			else
 				einfo "  Not stopping domain ${name} - not running"
 			fi
@@ -94,7 +94,7 @@ stop() {
 			name=$(get_domname ${dom})
 			if is_running ${name} ; then
 				ebegin "  Waiting for domain ${name} to shutdown"
-				xl shutdown --wait ${name} >/dev/null
+				xl shutdown -w ${name} >/dev/null
 				eend $?
 			else
 				einfo "  Not stopping domain ${name} - not running"
diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild
index 87385ccd1521..96211a37df24 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1.1-r1.ebuild,v 1.2 2011/09/05 20:41:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild,v 1.1 2011/09/10 17:22:46 alexxy Exp $
 
 EAPI="3"
 
@@ -187,6 +187,12 @@ src_install() {
 	# Remove RedHat-specific stuff
 	rm -r "${D}"/etc/init.d/xen* || die
 
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
 	dodoc README docs/README.xen-bugtool docs/ChangeLog
 	if use doc; then
 		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \