X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.debootstrap;h=34fd21b73b8694595da7e3ff6c4ba0171d65e7ef;hb=b611393a98072ffa745720ce3c1e7b3d1f851e07;hp=1036a6c4b4f98426e84217d5366fba756ad535ee;hpb=8314751ea70853c629cbfc1c8f3ce2ea9647de3f;p=util-vserver.git diff --git a/scripts/vserver-build.debootstrap b/scripts/vserver-build.debootstrap index 1036a6c..34fd21b 100644 --- a/scripts/vserver-build.debootstrap +++ b/scripts/vserver-build.debootstrap @@ -31,12 +31,12 @@ function initVariables findFile aux "$__CONFDIR"/.distributions/"$DISTRIBUTION"/debootstrap.mirror \ "$__CONFDIR"/.defaults/apps/debootstrap/mirror \ "$__DISTRIBDIR"/"$DISTRIBUTION"/debootstrap.mirror \ - "$__PKGLIBDEFAULTDIR"/debootstrap.mirror + "$__PKGLIBDEFAULTDIR"/debootstrap.mirror '' test -z "$aux" || read MIRROR <"$aux" } local file findFile file "$__CONFDIR"/.distributions/"$DISTRIBUTION"/debootstrap.options \ - "$__CONFDIR"/.defaults/apps/debootstrap/options + "$__CONFDIR"/.defaults/apps/debootstrap/options '' test -z "$file" || read options <"$file" } @@ -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) || \ @@ -106,6 +108,7 @@ EOF ## Wash the calculated architecture case $arch in (i?86|athlon) arch=i386;; + (x86_64) arch=amd64;; esac test -z "$arch" || echo "$arch" >$DEBOOTSTRAP_DIR/arch @@ -155,20 +158,14 @@ setup_writeInitialFstab findDebootstrap if test -z "$script"; then - for s in "$__CONFDIR/.distributions/$DISTRIBUTION/debootstrap.script" - "$__DISTRIBDIR/$DISTRIBUTION/debootstrap.script" - do - if test -e "$s"; then - script="$s" - break - fi - done + findFile script "$__CONFDIR/.distributions/$DISTRIBUTION/debootstrap.script" \ + "$__DISTRIBDIR/$DISTRIBUTION/debootstrap.script" '' 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"