X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;h=f615cad3d82b84480a2ee01538adeed02da343de;hb=87c7510132eca32faf111be501a5b022cda7d2c5;hp=f94a6aac508c5ea72759aeecf447a90d60625bdc;hpb=e73af524ef22868d4980ae13430c205798603c41;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index f94a6aa..f615cad 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -54,7 +54,8 @@ function populateDev { local spec - mkdir -p -m755 "$VDIR"/dev/pts + mkdir -p -m755 "$VDIR"/dev + mkdir -m755 "$VDIR"/dev/pts while read spec; do makeDevEntry "$VDIR"/dev $spec @@ -202,6 +203,9 @@ exist already; please try to use '--force', or remove them manually." mkdir -p -m755 "$VDIR" $_SETATTR --~barrier "$VDIR" + $_SETATTR --barrier "$VDIR"/.. || colwarn $"\ +WARNING: could not set the barrier attribute on '$VDIR/..', + please set it manually." base._addGeneratedFile "$VDIR" mkdir -p -m755 "$SETUP_CONFDIR"/apps "$VDIR"/etc @@ -260,10 +264,11 @@ 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 kill -s 15 -- -1 sleep 1 @@ -273,5 +278,5 @@ function startSleepingGuest function stopSleepingGuest { local guest="$1" - $_VSERVER "$guest" stop --rescue-init + $_VKILL --xid "$guest" -s INT -- 0 }