Work with newer versions of debootstrap too.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Wed, 5 Dec 2007 00:51:04 +0000 (00:51 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Wed, 5 Dec 2007 00:51:04 +0000 (00:51 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2641 94cd875c-1c1d-0410-91d2-eb244daf1a30

scripts/vserver-build.debootstrap

index 565d70b..ba2dd56 100644 (file)
@@ -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) || \