X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.debootstrap;h=af0cc93cba49e4ffbfe9ead33c9d29194a3e4401;hb=75385100bedf6d457e88bc2bb942a6f0771b0e06;hp=a58c27c53635d0324c4080a01a19d88199bd927a;hpb=a9e9ebfe6c239165d3e1a8df57548d1475d95b88;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.debootstrap b/util-vserver/scripts/vserver-build.debootstrap index a58c27c..af0cc93 100644 --- a/util-vserver/scripts/vserver-build.debootstrap +++ b/util-vserver/scripts/vserver-build.debootstrap @@ -66,7 +66,7 @@ ${tmp}..." $_CAT <&2 ERROR: Could not download the debootstrap package from - $dst + $tmp Usually, this means that Debian released a new version which is unknown to util-vserver and removed the known ones. To fix this, go to @@ -91,6 +91,18 @@ EOF tar xzf data.tar.gz export DEBOOTSTRAP_DIR=`pwd`/usr/lib/debootstrap DEBOOTSTRAP=`pwd`/usr/sbin/debootstrap + + local arch + arch=$(uname -i 2>/dev/null) || \ + arch=$(arch 2>/dev/null) || + arch= + + ## Wash the calculated architecture + case $arch in + (i?86|athlon) arch=i386;; + esac + + test -z "$arch" || echo "$arch" >$DEBOOTSTRAP_DIR/arch } popd &>/dev/null @@ -114,11 +126,11 @@ init while true; do case "$1" in - -d) DISTRIBUTION=$2; shift;; - -m) mirror=$2; shift;; - --debug) set -x;; - --) shift; break ;; - *) echo "vserver-build.debootstrap: internal error: unrecognized option '$1'" >&2 + (-d) DISTRIBUTION=$2; shift;; + (-m) mirror=$2; shift;; + (--debug) set -x;; + (--) shift; break ;; + (*) echo "vserver-build.debootstrap: internal error: unrecognized option '$1'" >&2 exit 1 ;; esac