1 files changed, 6 insertions, 8 deletions
diff --git a/helpers/lh_losetup b/helpers/lh_losetup
index a8d61766d..c2c7a7b39 100755
--- a/helpers/lh_losetup
+++ b/helpers/lh_losetup
@@ -9,21 +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="wrapper around losetup"
 HELP=""
 USAGE="${PROGRAM} <device> <file> <partition>"
 
 Arguments "${@}"
 
-Echo_debug "Init ${PROGRAM}"
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,8 +32,6 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Breakpoint "losetup: Init"
-
 if [ -z "${1}" ]
 then
 	DEVICE="`${LH_ROOT_COMMAND} ${LH_LOSETUP} -f`"