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"
}
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) || \
## 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
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"