X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.debootstrap;h=bac211eabb8a82d7b3c52075201f20f8d7fdbaf3;hb=cc0e846b03b1250540445dd1f92083ee338898a2;hp=a69f4865d68b7972d4e5c00392efad0cf8522b8b;hpb=0cde5f56b50bd0a29196d327d3f44ec6a023f06d;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.debootstrap b/util-vserver/scripts/vserver-build.debootstrap index a69f486..bac211e 100644 --- a/util-vserver/scripts/vserver-build.debootstrap +++ b/util-vserver/scripts/vserver-build.debootstrap @@ -17,7 +17,7 @@ function cleanUp { - test ! -d "$workdir" || rm -rf "$workdir" + test ! -d "$workdir" || $_RM -rf "$workdir" } function init @@ -29,11 +29,11 @@ function init function initVariables { - base.initVariables + base.init - test "${mirror-unset}" || { + test -n "${mirror-unset}" || { local aux - findFile aux "$CONFDIR"/.defaults/apps/debootstrap/mirror '' + findFile aux "$__CONFDIR"/.defaults/apps/debootstrap/mirror '' test -z "$aux" || read mirror <"$aux" } } @@ -50,17 +50,17 @@ function findDebootstrap { pushd . &>/dev/null DEBOOTSTRAP=$(which debootstrap 2>/dev/null) || { - dir=$(mktemp -d /var/tmp/debootstrap.XXXXXX) + dir=$($_MKTEMPDIR /var/tmp/debootstrap.XXXXXX) workdir=$dir dst=$dir/debootstrap.deb - findFile DEBOOTSTRAP_URI "$CONFDIR"/.defaults/apps/debootstrap/uri "$PKGLIBDEFAULTDIR"/debootstrap.uri + findFile DEBOOTSTRAP_URI "$__CONFDIR"/.defaults/apps/debootstrap/uri "$__PKGLIBDEFAULTDIR"/debootstrap.uri read tmp <$DEBOOTSTRAP_URI case "$tmp" in (/*) ln -s "$tmp" "$dst";; (http://*|ftp://*) $_WGET -nv -O "$dst" "$tmp" || { - cat <&2 + $_CAT <&2 ERROR: Could not download the debootstrap package from $dst @@ -73,7 +73,7 @@ to util-vserver and removed the known ones. To fix this, go to (or a nearby mirror) and search the URL for the most recent *.deb package matching your platform. Then, put this URL into - $CONFDIR/.defaults/apps/debootstrap/uri + $__CONFDIR/.defaults/apps/debootstrap/uri and retry the vserver-build command again. EOF @@ -96,8 +96,8 @@ EOF function fixupDebian { - rm -rf "$1"/dev - mv "$1"/dev.X "$1"/dev + $_RM -rf "$1"/dev + $_MV "$1"/dev.X "$1"/dev } @@ -137,3 +137,5 @@ mv "$VDIR"/dev "$VDIR"/dev.X "$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" || : ## HACK: ignore all errors... fixupDebian "$VDIR" test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" + +base.setSuccess