-# $Id: vserver-build.debootstrap 2298 2006-09-12 11:21:38Z dhozac $ --*- sh -*--
+# $Id: vserver-build.debootstrap 2528 2007-04-13 09:02:29Z hollow $ --*- sh -*--
# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
#
# 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
{
base.init
- test -n "${mirror-unset}" || {
+ test -n "${mirror}" || {
local aux
- findFile aux "$__CONFDIR"/.defaults/apps/debootstrap/mirror ''
+ findFile aux "$__CONFDIR"/.defaults/apps/debootstrap/mirror "$__PKGLIBDEFAULTDIR"/debootstrap.mirror
test -z "$aux" || read mirror <"$aux"
}
}
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
findDebootstrap
-test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
+test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" "$mirror"
mv "$VDIR"/dev "$VDIR"/dev.X
-"$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" "$script" || : ## 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"
+test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" "$mirror"
+$_RM -fr "$workdir"
base.setSuccess