[Debian-live-changes] r1034 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-11 22:38:50 +0000 (Wed, 11 Apr 2007)
New Revision: 1034

Modified:
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-04-11 22:34:44 UTC (rev 1033)
+++ dists/trunk/live-helper/helpers/lh_config	2007-04-11 22:38:50 UTC (rev 1034)
@@ -24,20 +24,6 @@
 
 Echo_debug "Init ${PROGRAM}"
 
-if [ "${1}" != "newconfig" ] && [ -z "${LH_CONFIG}" ]
-then
-	# Source existing configuration
-	Read_conffile "${LIVE_ROOT}"/config/common
-	Read_conffile "${LIVE_ROOT}"/config/bootstrap
-	Read_conffile "${LIVE_ROOT}"/config/chroot
-	Read_conffile "${LIVE_ROOT}"/config/image
-fi
-
-# Setting defaults
-Set_defaults
-
-Breakpoint "config: Init"
-
 if [ -n "${LH_CONFIG}" ]
 then
 	if [ -d /usr/share/live-helper/configs/"${LH_CONFIG}" ]
@@ -51,11 +37,27 @@
 		mkdir -p "${LH_CONFIG}"/config/chroot_localpackageslists
 		mkdir -p "${LH_CONFIG}"/config/chroot_sources
 		mkdir -p "${LH_CONFIG}"/config/binary_localincludes
+
+		LIVE_ROOT="${LH_CONFIG}"
 	else
 		Echo_error "Couldn't find config ${LH_CONFIG} in /usr/share/live-helper/configs/."
 	fi
-else
+fi
 
+if [ "${1}" != "newconfig" ]
+then
+	# Source existing configuration
+	Read_conffile "${LIVE_ROOT}"/config/common
+	Read_conffile "${LIVE_ROOT}"/config/bootstrap
+	Read_conffile "${LIVE_ROOT}"/config/chroot
+	Read_conffile "${LIVE_ROOT}"/config/image
+fi
+
+# Setting defaults
+Set_defaults
+
+Breakpoint "config: Init"
+
 # Creating configuration directory
 mkdir -p "${LIVE_ROOT}"/config
 
@@ -322,5 +324,3 @@
 
 # Creating lh_binary_* directories
 mkdir -p "${LIVE_ROOT}"/config/binary_localincludes
-
-fi