From 1863ed88740575342008ac5f694d03e944bcece2 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:49 +0200
Subject: Adding live-helper 1.0~a5-1.

---
 helpers/lh_bootstrap_cdebootstrap | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'helpers/lh_bootstrap_cdebootstrap')

diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 2430cc8c5..9581d8c0e 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -25,14 +25,17 @@ Arguments "${@}"
 # Ensure that a system is built as root
 lh_testroot
 
-# Starting helper
 Echo_debug "Init ${PROGRAM}"
 
 # Reading configuration files
-Read_conffile config/common
 Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/common
+Read_conffile config/image
 Set_defaults
 
+Breakpoint "bootstrap_cdeboostrap: Init"
+
 if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
 then
 	exit 0
@@ -59,9 +62,9 @@ then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_ARCHITECTURE}"
 fi
 
-if [ -n "${LIVE_DISTRIBUTION_CONFIG}" ]
+if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]
 then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_DISTRIBUTION_CONFIG}"
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_BOOTSTRAP_CONFIG}"
 fi
 
 if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
@@ -71,17 +74,17 @@ else
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
 fi
 
-if [ "${DEBUG}" = "true" ]
+if [ "${LH_DEBUG}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
 fi
 
-if [ "${QUIET}" = "true" ]
+if [ "${LH_QUIET}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
 fi
 
-if [ "${VERBOSE}" = "true" ]
+if [ "${LH_VERBOSE}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
 fi
-- 
cgit v1.2.3