From de2ee1bbfe9ec1f75172aac6022e8dd9938572ea Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Sat, 29 Oct 2005 15:34:30 +0000
Subject: [PATCH] fixed the TIMEOUT case in yet another way: now, start 'vkill'
 and a killall command in the same backgrounded subshell. Parameter committal
 between the different shell instances is a horror and just a question of time
 until it breaks :(

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2218 94cd875c-1c1d-0410-91d2-eb244daf1a30
---
 util-vserver/scripts/vserver.functions | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions
index 19a8f00..6b7bf45 100644
--- a/util-vserver/scripts/vserver.functions
+++ b/util-vserver/scripts/vserver.functions
@@ -808,27 +808,35 @@ function initWait
 	local _is_tmpdir
 	_is_tmpdir=$($_MKTEMPDIR /tmp/vwaitstat.XXXXXX)
 
-	$_NOHUP $_VWAIT --timeout "$VSHELPER_SYNC_TIMEOUT" \
-	    --status-fd 3 "$2"  \
-	    >>$_is_tmpdir/out 2>$_is_tmpdir/err 3>$_is_tmpdir/fifo &
+	(
+	    $_VWAIT --timeout "$VSHELPER_SYNC_TIMEOUT" \
+		--status-fd 3 "$2" \
+		>>$_is_tmpdir/out 2>$_is_tmpdir/err 3>$_is_tmpdir/fifo
 
+	    $_VPS axf | $_EGREP -e "^[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4
+
+	    killContext "$S_CONTEXT" 9
+	) 4>$_is_tmpdir/procs &
+	    
 	echo "$!" >$_is_tmpdir/pid
 	eval "$3"=$_is_tmpdir
-    fi
+    fi </dev/null
 }
 
 
-## Usage: _waitForVWait <vserver> <fifo> <pid>
+## Usage: _waitForVWait <vserver> <fifo> <pid> <procs>
 function _waitForVWait
 {
     declare -a status
+    declare -r procs=$4
+
     wait "$3" || :
     getFileArray status "$2"
     set -- ${status[0]}
 
-    case "$2" in
+    case "$1" in
 	(ERROR)		warning $"\
-'vwait' exited with error '$3' which indicates that vserver could not
+'vwait' exited with error '$2' which indicates that vserver could not
 be stopped properly"
 			;;
 	(FINISHED)	;;
@@ -838,15 +846,13 @@ killed by sending a SIGKILL signal. Please investigate the reasons
 and/or increase the timeout in apps/vshelper/sync-timeout."
 			;;
 
-	(TIMEOUT)	local procs=$($_VPS axf | $_EGREP -e "^[^ \t]+[ \t]+$S_CONTEXT[ \t]+")
-			warning $"\
+	(TIMEOUT)	warning $"\
 A timeout occured while waiting for the vserver to finish and it will
 be killed by sending a SIGKILL signal. The following process list
 might be useful for finding out the reason of this behavior:
 
 $procs
 "
-		    	killContext "$S_CONTEXT" 9
 			;;
 
 	(\?\?\?|*)	warning $"\
@@ -867,7 +873,7 @@ function waitForSync
     local vwait_pid=$4
 
     if test -d "$vwait_statdir"; then
-	_waitForVWait "$cfgdir" "$vwait_statdir/fifo" "$( <$vwait_statdir/pid )"
+	_waitForVWait "$cfgdir" "$vwait_statdir/fifo" "$( <$vwait_statdir/pid )" "$( < $vwait_statdir/procs )"
     elif test -n "$_NEED_VSHELPER_SYNC"; then
 	$_VSHELPER_SYNC "$fifo" "$VSHELPER_SYNC_TIMEOUT" || \
 	    warning $"\
-- 
1.8.1.5