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=694fa11fdb2e76a84213ab5c5f6d33496df23655;hpb=7ca0b1269dcca2c201cb2f800b7f7251250bd6d9;p=util-vserver.git diff --git a/scripts/vserver-build.debootstrap b/scripts/vserver-build.debootstrap index 694fa11..78e5f11 100644 --- a/scripts/vserver-build.debootstrap +++ b/scripts/vserver-build.debootstrap @@ -18,18 +18,26 @@ function init { workdir= - mirror= + MIRROR= + options= } function initVariables { base.init - test -n "${mirror-unset}" || { + test -n "${MIRROR}" || { local aux - findFile aux "$__CONFDIR"/.defaults/apps/debootstrap/mirror '' - test -z "$aux" || read mirror <"$aux" + findFile aux "$__CONFDIR"/.distributions/"$DISTRIBUTION"/debootstrap.mirror \ + "$__CONFDIR"/.defaults/apps/debootstrap/mirror \ + "$__DISTRIBDIR"/"$DISTRIBUTION"/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 '' + test -z "$file" || read options <"$file" } function initFilesystem @@ -87,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) || \ @@ -125,7 +135,7 @@ init while true; do case "$1" in (-d) DISTRIBUTION=$2; shift;; - (-m) mirror=$2; shift;; + (-m) MIRROR=$2; shift;; (-s) script=$2; shift;; (--debug) set -x;; (--) shift; break ;; @@ -146,9 +156,16 @@ setup_writeInitialFstab findDebootstrap -test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" +if test -z "$script"; then + 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 -- "$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" "$script" || : ## HACK: ignore all errors... +$_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"