summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2008-02-07 15:07:13 -0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:35:58 +0100
commitffa2568b55ef3dfaa673ba5a3681577b8ead8cd0 (patch)
tree65b7d58d088a44dbbe845a84795aa1c44c459c88 /helpers
parentbc23f611309e4f82dc1c7a7936678403e92875b6 (diff)
downloadlive-build-ffa2568b55ef3dfaa673ba5a3681577b8ead8cd0.zip
live-build-ffa2568b55ef3dfaa673ba5a3681577b8ead8cd0.tar.gz
bootstrap: adds support to debootstrap 1.0.7
New debootstrap has change the scripts to /usr/share since they're architecture independent code. The support for it has been added however it fallback to /usr/lib to keep backward compatibility.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_bootstrap_debootstrap7
1 files changed, 6 insertions, 1 deletions
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index a69a086..8bfdd6b 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -69,7 +69,12 @@ fi
if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
then
- LH_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
+ if [ -d "/usr/share/debootstrap/scripts/" ]
+ then
+ LH_DEBOOTSTRAP_SCRIPT="/usr/share/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
+ else
+ LH_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
+ fi
fi
if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]