From: Daniel Hokka Zakrisson Date: Wed, 5 Dec 2007 00:51:04 +0000 (+0000) Subject: Work with newer versions of debootstrap too. X-Git-Tag: release-0.30.215~66 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5397bdc63fce5a6e139e2b594924d3a9ac6f4db;p=util-vserver.git Work with newer versions of debootstrap too. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2641 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/vserver-build.debootstrap b/scripts/vserver-build.debootstrap index 565d70b..ba2dd56 100644 --- a/scripts/vserver-build.debootstrap +++ b/scripts/vserver-build.debootstrap @@ -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) || \