X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.debootstrap;h=78e5f11ed77837aaa83a06137a0604f04164ec7a;hb=01a14ee7d420aea287aa009f21c2e38e944ccbb4;hp=565d70b235b612f8c0a3d56b17ba19a9de9ad538;hpb=3c261f238b500d5d17a60ea2c5063c4706f28020;p=util-vserver.git diff --git a/scripts/vserver-build.debootstrap b/scripts/vserver-build.debootstrap index 565d70b..78e5f11 100644 --- a/scripts/vserver-build.debootstrap +++ b/scripts/vserver-build.debootstrap @@ -95,8 +95,10 @@ EOF cd $dir ar x "$dst" tar xzf data.tar.gz - export DEBOOTSTRAP_DIR=`pwd`/usr/lib/debootstrap + DEBOOTSTRAP_DIR=`pwd`/usr/lib/debootstrap DEBOOTSTRAP=`pwd`/usr/sbin/debootstrap + test -d "$DEBOOTSTRAP_DIR" || DEBOOTSTRAP_DIR=`pwd`/usr/share/debootstrap + export DEBOOTSTRAP_DIR local arch arch=$(uname -i 2>/dev/null) || \ @@ -162,7 +164,7 @@ fi export MIRROR test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" mv "$VDIR"/dev "$VDIR"/dev.X -"$_VNAMESPACE" --new -- \ +$_VNAMESPACE --new -- \ "$DEBOOTSTRAP" $options "$@" "$DISTRIBUTION" "$VDIR" "$MIRROR" "$script" || : ## HACK: ignore all errors... fixupDebian "$VDIR" test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"