Prevent deadlock between sc_helper vserver ... stop invocation, and stopSleepingGuest.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Sat, 26 Jan 2008 11:44:15 +0000 (11:44 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Sat, 26 Jan 2008 11:44:15 +0000 (11:44 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2672 94cd875c-1c1d-0410-91d2-eb244daf1a30

scripts/vserver-build.functions

index f94a6aa..b56a353 100644 (file)
@@ -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
 }