[gentoo-commits] gentoo-x86 commit in app-emulation/lxc/files: lxc.initd

[Diego Petteno (flameeyes)]

flameeyes    11/09/28 21:47:46

  Modified:             lxc.initd
  Log:
  Fix init script to find the correct PID for the container's init and use a 30-seconds timeout to see if it has stopped correctly. Thanks to Stef Simoens for both (bug #384265).
  
  (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  app-emulation/lxc/files/lxc.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd?r1=1.7&r2=1.8

Index: lxc.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lxc.initd	14 Sep 2011 19:39:40 -0000	1.7
+++ lxc.initd	28 Sep 2011 21:47:46 -0000	1.8
@@ -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.7 2011/09/14 19:39:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.8 2011/09/28 21:47:46 flameeyes Exp $
 
 CONTAINER=${SVCNAME#*.}
 
@@ -111,15 +111,19 @@
 	    return 0
 	fi
 
-	init_pid=$(head -n1 ${cgroupmount}/${CONTAINER}/tasks)
+	init_pid=$(lxc-info -n ${CONTAINER} --pid | cut -d: -f 2)
 
 	ebegin "Shutting down system in ${CONTAINER}"
 	kill -INT ${init_pid}
 	eend $?
 
-	sleep 15
-
-	missingprocs=$(pgrep -P ${init_pid})
+	TIMEOUT=${TIMEOUT:-30}
+	i=0
+	while [ -n "${missingprocs}" -a $i -lt ${TIMEOUT} ]; do
+		sleep 1
+		missingprocs=$(pgrep -P ${init_pid})
+		i=$(expr $i + 1)
+	done
 
 	if [ -n "${missingprocs}" ]; then
 		ewarn "Something failed to properly shut down in ${CONTAINER}"