1 files changed, 6 insertions, 11 deletions
diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap
index 36a7a0a10..fbb8f17e8 100755
--- a/helpers/lh_bootstrap
+++ b/helpers/lh_bootstrap
@@ -9,26 +9,21 @@
 
 set -e
 
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
 do
-	. ${FUNCTION}
+	. "${FUNCTION}"
 done
 
-# Set static variables
+# Setting static variables
 DESCRIPTION="bootstrap a Debian system"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
 Arguments "${@}"
 
-Echo_debug "Init ${PROGRAM}"
-
-# Starting helper
-Echo_debug "Init ${PROGRAM}"
-
-Breakpoint "bootstrap: Init"
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap