[Debian-live-changes] r961 - in dists/trunk/live-helper: functions helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-06 11:58:14 +0000 (Fri, 06 Apr 2007)
New Revision: 961

Modified:
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_binary_includes
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
Log:


Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-04-06 11:57:52 UTC (rev 960)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-04-06 11:58:14 UTC (rev 961)
@@ -144,7 +144,7 @@
 	fi
 
 	# Setting distribution configuration value
-	# LIVE_DISTRIBUTION_CONFIG
+	# LIVE_BOOTSTRAP_CONFIG
 
 	# Setting flavour value
 	if [ -z "${LIVE_BOOTSTRAP_FLAVOUR}" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-06 11:57:52 UTC (rev 960)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-06 11:58:14 UTC (rev 961)
@@ -29,46 +29,48 @@
 Read_conffile config/image
 Set_defaults
 
-if [ "${LIVE_INCLUDES}" != "none" ]
+if [ "${LIVE_INCLUDES}" = "none" ]
 then
-	# Requiring stage file
-	Require_stagefile .stage/bootstrap
+	exit 0
+fi
 
-	# Checking lock file
-	Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/bootstrap
 
-	# Creating lock file
-	Create_lockfile .lock
+# Checking lock file
+Check_lockfile .lock
 
-	# Checking stage file
-	Check_stagefile .stage/binary_includes
+# Creating lock file
+Create_lockfile .lock
 
-	# Check includes
-	if [ ! -d "${LIVE_INCLUDES}" ]
-	then
-		if [ -d ../"${LIVE_INCLUDES}" ]
-		then
-			LIVE_INCLUDES="../${LIVE_INCLUDES}"
-		else
-			Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
-			exit 1
-		fi
-	fi
+# Checking stage file
+Check_stagefile .stage/binary_includes
 
-	if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
+# Check includes
+if [ ! -d "${LIVE_INCLUDES}" ]
+then
+	if [ -d ../"${LIVE_INCLUDES}" ]
 	then
-		cd "${LIVE_INCLUDES}"/common
-		find . | cpio -dmpu "${OLDPWD}"/binary
-		cd "${OLDPWD}"
+		LIVE_INCLUDES="../${LIVE_INCLUDES}"
+	else
+		Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
+		exit 1
 	fi
+fi
 
-	if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
-	then
-		cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
-		find . | cpio -dmpu "${OLDPWD}"/binary
-		cd "${OLDPWD}"
-	fi
+if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
+then
+	cd "${LIVE_INCLUDES}"/common
+	find . | cpio -dmpu "${OLDPWD}"/binary
+	cd "${OLDPWD}"
+fi
 
-	# Creating stage file
-	Create_stagefile .stage/binary_includes
+if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
+then
+	cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
+	find . | cpio -dmpu "${OLDPWD}"/binary
+	cd "${OLDPWD}"
 fi
+
+# Creating stage file
+Create_stagefile .stage/binary_includes

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-06 11:57:52 UTC (rev 960)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-06 11:58:14 UTC (rev 961)
@@ -61,9 +61,9 @@
 	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" ]