Revision bump to fix two issues with the init script reported by Alexander Y. Fomichev (bug #387675 and #387679).

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

4 files changed, 22 insertions, 11 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 992a2ecc8361..01e666fe8b5e 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/lxc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.28 2011/09/28 21:47:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.29 2011/10/19 17:51:49 flameeyes Exp $
+
+*lxc-0.7.5-r3 (19 Oct 2011)
+
+  19 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org> -lxc-0.7.5-r2.ebuild,
+  +lxc-0.7.5-r3.ebuild, files/lxc.initd:
+  Revision bump to fix two issues with the init script reported by Alexander Y.
+  Fomichev (bug #387675 and #387679).
 
 *lxc-0.7.5-r2 (28 Sep 2011)
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 4b2826580a60..d1bd38540a4c 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX lxc.initd 3669 RMD160 6826f16014989faca6461f020875f58982dc3d15 SHA1 7727b75b59ec71147ae2478bc6c7a838c96ec4b4 SHA256 71cbb6ecbfa10a43ff6e9bdddad2b9a331e55d18d49d63f4ee651dc03818f519
+AUX lxc.initd 3746 RMD160 3a8749586c3ed6dedce7fc18d908903dfb8bf5a0 SHA1 7308443ab4c99de8604c31d2e3ef9c55a197ee05 SHA256 7c805f22792fd1b26b2ef102b4345479401c9b2f1e6f32622d66717354fb4328
 DIST lxc-0.7.5.tar.gz 265562 RMD160 93407be1ebf31bdcfa617e60672d9f86ba2940d1 SHA1 9712dccdcd2c10a522134fa17384a5b9e38fce0e SHA256 019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c
-EBUILD lxc-0.7.5-r2.ebuild 3206 RMD160 1a476cf353c04c30b71c75a034a856c46a460146 SHA1 f877e25376e79352f199ec056c6b00155530bdf0 SHA256 2c15ec330886091bce73323aeef5198cd58e1f75dfe64dcaae7fe053b7a53781
-MISC ChangeLog 6651 RMD160 d4ab541e29d4e92f665e1995f98852abc2c09ec8 SHA1 da732d308d63ec13f6eda3df286cf2774daed2ed SHA256 fdc3bfb4cdd883597155b9ae63fce07fb6b78763f6d943c1eda088b973714d4c
+EBUILD lxc-0.7.5-r3.ebuild 3206 RMD160 0b7d5f0ef7e6e908ce783af5662a0ad089a2b866 SHA1 f0a44bec950502bd74b3abcd81421d1e0a15f937 SHA256 43a9c13ea56d238a8797f266795d2837ba321ddf0d7db88a877be45dfcd4713a
+MISC ChangeLog 6918 RMD160 aefabcbfad4969606fed2257d974b25ade8f8724 SHA1 2aae2d1e27d9fda7998e0fa5be8bafa647257c49 SHA256 d3dda626d338a8fc2cfb6cfcf80d7463426cfc6649bc1626302daadba6e5b21e
 MISC metadata.xml 653 RMD160 d6139a7ce3a5dab18f33c7f111f2e7827c290723 SHA1 47ba631625b4f2b20e491a964e65c78dd236f6f2 SHA256 35f64761067f47ff7abd0e3f3cb57f4bab888a2546bf3267d59987505101a190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6DlfMACgkQAiZjviIA2Xhu9QCfYsZxzeigfp+SkqVLfy0T2gvI
-YkgAnA4h5OzDEpbSTTmSfOEFBIuiTaqw
-=VnMl
+iEYEARECAAYFAk6fDjcACgkQAiZjviIA2XgyzACgo3eKX66/mj/RnkAzRu6n31Qq
+BrQAn1u/bkp9r/T4Sv6GmpvguKqg2OYE
+=6IQg
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/files/lxc.initd b/app-emulation/lxc/files/lxc.initd
index 7275826025a1..fd70c72b3879 100644
--- a/app-emulation/lxc/files/lxc.initd
+++ b/app-emulation/lxc/files/lxc.initd
@@ -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/lxc/files/lxc.initd,v 1.8 2011/09/28 21:47:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.9 2011/10/19 17:51:48 flameeyes Exp $
 
 CONTAINER=${SVCNAME#*.}
 
@@ -113,15 +113,19 @@ stop() {
 
 	init_pid=$(lxc-info -n ${CONTAINER} --pid | cut -d: -f 2)
 
+	if [ "${init_pid}" = "-1" ]; then
+	    ewarn "${CONTAINER} doesn't seem to be running."
+	    return 0
+	fi
+
 	ebegin "Shutting down system in ${CONTAINER}"
 	kill -INT ${init_pid}
 	eend $?
 
 	TIMEOUT=${TIMEOUT:-30}
 	i=0
-	while [ -n "${missingprocs}" -a $i -lt ${TIMEOUT} ]; do
+	while [ -n "$(pgrep -P ${init_pid})" -a $i -lt ${TIMEOUT} ]; do
 		sleep 1
-		missingprocs=$(pgrep -P ${init_pid})
 		i=$(expr $i + 1)
 	done
 
diff --git a/app-emulation/lxc/lxc-0.7.5-r2.ebuild b/app-emulation/lxc/lxc-0.7.5-r3.ebuild
index 991e418a521f..4b0e7913a9f8 100644
--- a/app-emulation/lxc/lxc-0.7.5-r2.ebuild
+++ b/app-emulation/lxc/lxc-0.7.5-r3.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/lxc/lxc-0.7.5-r2.ebuild,v 1.1 2011/09/28 21:47:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.7.5-r3.ebuild,v 1.1 2011/10/19 17:51:49 flameeyes Exp $
 
 EAPI="4"