From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SsRub-0004s0-Nu for garchives@archives.gentoo.org; Sat, 21 Jul 2012 05:07:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76F02E0595; Sat, 21 Jul 2012 05:07:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3FC57E059C for ; Sat, 21 Jul 2012 05:07:18 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75A331B40B5 for ; Sat, 21 Jul 2012 05:07:17 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 948) id 604F22004C; Sat, 21 Jul 2012 05:07:15 +0000 (UTC) From: "Diego Petteno (flameeyes)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, flameeyes@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/lxc/files: lxc.initd.2 X-VCS-Repository: gentoo-x86 X-VCS-Files: lxc.initd.2 X-VCS-Directories: app-emulation/lxc/files X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Petteno Content-Type: text/plain; charset=utf8 Message-Id: <20120721050715.604F22004C@flycatcher.gentoo.org> Date: Sat, 21 Jul 2012 05:07:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: da568155-250b-4ebc-b04b-ddfd927e172b X-Archives-Hash: 2a0ae898b077bce28a5beedbaa4ddce6 flameeyes 12/07/21 05:07:15 Modified: lxc.initd.2 Log: Version bump; also fixes bug #427078 and #427086, thanks to Alexander Z= ubkov for the report. =20 (Portage version: 2.2.0_alpha118/cvs/Linux x86_64) Revision Changes Path 1.5 app-emulation/lxc/files/lxc.initd.2 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/= files/lxc.initd.2?rev=3D1.5&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/= files/lxc.initd.2?rev=3D1.5&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/= files/lxc.initd.2?r1=3D1.4&r2=3D1.5 Index: lxc.initd.2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lxc.initd.2 7 Jun 2012 12:59:28 -0000 1.4 +++ lxc.initd.2 21 Jul 2012 05:07:15 -0000 1.5 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v= 1.4 2012/06/07 12:59:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v= 1.5 2012/07/21 05:07:15 flameeyes Exp $ =20 CONTAINER=3D${SVCNAME#*.} =20 @@ -104,7 +104,7 @@ return 0 fi =20 - init_pid=3D$(lxc-info -n ${CONTAINER} --pid | cut -d: -f 2) + init_pid=3D$(lxc-info -n ${CONTAINER} --pid | awk '{ print $2 }') =20 if [ "${init_pid}" =3D "-1" ]; then ewarn "${CONTAINER} doesn't seem to be running." @@ -112,7 +112,7 @@ fi =20 ebegin "Shutting down system in ${CONTAINER}" - kill -INT ${init_pid} + kill -PWR ${init_pid} eend $? =20 TIMEOUT=3D${TIMEOUT:-30}