diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2008-02-07 15:07:13 -0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:35:58 +0100 |
| commit | ffa2568b55ef3dfaa673ba5a3681577b8ead8cd0 (patch) | |
| tree | 65b7d58d088a44dbbe845a84795aa1c44c459c88 /helpers | |
| parent | bc23f611309e4f82dc1c7a7936678403e92875b6 (diff) | |
| download | vyos-live-build-ffa2568b55ef3dfaa673ba5a3681577b8ead8cd0.tar.gz vyos-live-build-ffa2568b55ef3dfaa673ba5a3681577b8ead8cd0.zip | |
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-x | helpers/lh_bootstrap_debootstrap | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index a69a0869a..8bfdd6be6 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}" ] |