Fix issue in the init script where we weren't passing the correct values to a function resulting in shutdown failing. bug #405341

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 14 insertions, 6 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 15be8869d8bb..99bb838157e3 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.160 2012/02/20 15:35:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.161 2012/02/23 16:34:57 cardoe Exp $
+
+*libvirt-0.9.10-r3 (23 Feb 2012)
+
+  23 Feb 2012; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.9.10-r2.ebuild,
+  +libvirt-0.9.10-r3.ebuild, libvirt-9999.ebuild, +files/libvirtd.init-r8,
+  -files/libvirtd.init-r7:
+  Fix issue in the init script where we weren't passing the correct values to a
+  function resulting in shutdown failing. bug #405341
 
 *libvirt-0.9.10-r2 (20 Feb 2012)
 
diff --git a/app-emulation/libvirt/files/libvirtd.init-r7 b/app-emulation/libvirt/files/libvirtd.init-r8
index a8ad7c1922e0..402617f9dae4 100755
--- a/app-emulation/libvirt/files/libvirtd.init-r7
+++ b/app-emulation/libvirt/files/libvirtd.init-r8
@@ -70,7 +70,7 @@ stop() {
         for dom_id in $(libvirtd_dom_list qemu) ; do
             vm_name="$(libvirtd_virsh qemu domname ${dom_id} | head -n 1)"
             einfo "   ${vm_name}"
-            libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${dom_id} > /dev/null
+            libvirtd_virsh qemu ${LIBVIRTD_KVM_SHUTDOWN} ${dom_id} > /dev/null
         done
 
         if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
diff --git a/app-emulation/libvirt/libvirt-0.9.10-r2.ebuild b/app-emulation/libvirt/libvirt-0.9.10-r3.ebuild
index 0ff52243ceef..cd6a025ce0f9 100644
--- a/app-emulation/libvirt/libvirt-0.9.10-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.10-r2.ebuild,v 1.1 2012/02/20 15:35:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.10-r3.ebuild,v 1.1 2012/02/23 16:34:57 cardoe Exp $
 
 BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -213,7 +213,7 @@ src_install() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
-	newinitd "${FILESDIR}/libvirtd.init-r7" libvirtd || die
+	newinitd "${FILESDIR}/libvirtd.init-r8" libvirtd || die
 	newconfd "${FILESDIR}/libvirtd.confd-r3" libvirtd || die
 
 	keepdir /var/lib/libvirt/images
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index c2962791bacd..c57f5d0d4b0f 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.21 2012/02/20 15:35:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.22 2012/02/23 16:34:57 cardoe Exp $
 
 #BACKPORTS=2
 #AUTOTOOLIZE=yes
@@ -213,7 +213,7 @@ src_install() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
-	newinitd "${FILESDIR}/libvirtd.init-r7" libvirtd || die
+	newinitd "${FILESDIR}/libvirtd.init-r8" libvirtd || die
 	newconfd "${FILESDIR}/libvirtd.confd-r3" libvirtd || die
 
 	keepdir /var/lib/libvirt/images