[SCM] debian-live/live-helper branch, master, updated. 1.0_a37-2-45-gc7cbfa0

[Otavio Salvador]

The following commit has been merged in the master branch:
commit c7cbfa07547cc26c030d58bcfc4b3f84a55127f8
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Thu Feb 7 15:07:13 2008 -0200

    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.

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}" ]

-- 
debian-live/live-helper