X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;h=1df67e584297e206ee698b6a3249a05b6757b261;hb=079edecc5b1d51bb23c197741ea76cad58351c50;hp=9bbdd003f757438fab77c36232138068e9ad7c28;hpb=d4cf3a06cc3499abd1913aa6ba2c4590b9c5b673;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index 9bbdd00..1df67e5 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -240,11 +240,25 @@ function base._initVariables findFile BUILD_INITPOST "$__CONFDIR/.distributions/$DISTRIBUTION/initpost" "$__DISTRIBDIR/$DISTRIBUTION/initpost" "" } +declare -a __BASE_CLEANUP +function base.pushCleanup +{ + __BASE_CLEANUP=( "${__BASE_CLEANUP[@]}" "$*" ) +} + +function base.popCleanup +{ + unset __BASE_CLEANUP[$((${#__BASE_CLEANUP[@]} - 1))] +} + function base.__cleanup { - test -z "$OPTION_KEEP" || return 0 - test -z "$__BASE_SUCCESS" || return 0 + for cmd in "${__BASE_CLEANUP[@]}"; do + $cmd + done + test -z "$__BASE_SUCCESS" || return 0 + test -z "$OPTION_KEEP" || return 0 rm -rf "${__BASE_GENERATED_FILES[@]}" } @@ -271,11 +285,7 @@ function startSleepingGuest exec > /dev/null exec 2> /dev/null trap 'kill -s 9 -- -1; exit 0' INT - i=0 - while [ \$i -lt $timeout ]; do - sleep 1 - let ++i - done + sleep $timeout kill -s 15 -- -1 sleep 1 kill -s 9 -- -1"