From: Daniel Hokka Zakrisson Date: Sat, 26 Jan 2008 11:44:15 +0000 (+0000) Subject: Prevent deadlock between sc_helper vserver ... stop invocation, and stopSleepingGuest. X-Git-Tag: release-0.30.215~35 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57957b0b44656f3b29479e1b2efdf953a0e927ef;p=util-vserver.git Prevent deadlock between sc_helper vserver ... stop invocation, and stopSleepingGuest. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2672 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index f94a6aa..b56a353 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -264,6 +264,7 @@ function startSleepingGuest $_VSERVER "$guest" start --rescue --rescue-init bash -c " exec > /dev/null exec 2> /dev/null + trap 'kill -s 9 -- -1; exit 0' INT sleep $timeout kill -s 15 -- -1 sleep 1 @@ -273,5 +274,5 @@ function startSleepingGuest function stopSleepingGuest { local guest="$1" - $_VSERVER "$guest" stop --rescue-init + $_VKILL --xid "$guest" -s INT -- 1 }