X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.debootstrap;h=40526ce19dc0592bd68f55980c13dd10b32e5dce;hb=ed5a19848918682e148235cb01855ba31f9e5109;hp=56575d1a76825b3fee7c07676899307a194bc485;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/scripts/vserver-build.debootstrap b/scripts/vserver-build.debootstrap index 56575d1..40526ce 100644 --- a/scripts/vserver-build.debootstrap +++ b/scripts/vserver-build.debootstrap @@ -15,16 +15,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -function cleanUp -{ - test ! -d "$workdir" || $_RM -rf "$workdir" -} - function init { workdir= mirror= - trap "cleanUp" EXIT } function initVariables @@ -55,6 +49,8 @@ function findDebootstrap dir=$($_MKTEMPDIR -p /var/tmp debootstrap.XXXXXX) workdir=$dir dst=$dir/debootstrap.deb + + base._addGeneratedFile "$workdir" findFile DEBOOTSTRAP_URI "$__CONFDIR"/.defaults/apps/debootstrap/uri "$__PKGLIBDEFAULTDIR"/debootstrap.uri read tmp <$DEBOOTSTRAP_URI @@ -121,7 +117,7 @@ function fixupDebian ### main starts here <--- -tmp=$(getopt -o '+d:m:' --long debug -n "$0" -- "$@") || exit 1 +tmp=$(getopt -o '+d:m:s:' --long debug -n "$0" -- "$@") || exit 1 eval set -- "$tmp" init @@ -130,6 +126,7 @@ while true; do case "$1" in (-d) DISTRIBUTION=$2; shift;; (-m) mirror=$2; shift;; + (-s) script=$2; shift;; (--debug) set -x;; (--) shift; break ;; (*) echo "vserver-build.debootstrap: internal error: unrecognized option '$1'" >&2 @@ -151,7 +148,7 @@ findDebootstrap test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" mv "$VDIR"/dev "$VDIR"/dev.X -"$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" || : ## HACK: ignore all errors... +"$_VNAMESPACE" --new -- "$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" "$script" || : ## HACK: ignore all errors... fixupDebian "$VDIR" test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"