X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;h=3e2b4f9831422ea64726b068ad5f88fe8683db2e;hb=6c03c74dde26b0a0b3a17108b083a862b16fb0de;hp=2f22192e93c75351092963a10be356e68cc0c749;hpb=d51ba756dbbd229a05b6bd919fdc413ab5c57fd5;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index 2f22192..3e2b4f9 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -264,12 +264,16 @@ function base.setSuccess function startSleepingGuest { local guest="$1" - local timeout="$2" + local timeout="${2:-15}" $_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 + i=0 + while [ \$i -lt $timeout ]; do + sleep 1 + let ++i + done kill -s 15 -- -1 sleep 1 kill -s 9 -- -1" @@ -278,5 +282,5 @@ function startSleepingGuest function stopSleepingGuest { local guest="$1" - $_VKILL --xid "$guest" -s INT -- 1 + $_VSERVER "$guest" stop --rescue-init }