[Debian-live-changes] r1415 - in dists/trunk/live-helper: docs examples functions helpers

Daniel Baumann daniel at alioth.debian.org
Wed May 9 07:22:01 UTC 2007


Author: daniel
Date: 2007-05-09 07:21:59 +0000 (Wed, 09 May 2007)
New Revision: 1415

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/examples/beryl.sources.list
   dists/trunk/live-helper/examples/bpo.sources.list
   dists/trunk/live-helper/examples/edu.sources.list
   dists/trunk/live-helper/examples/fai.sources.list
   dists/trunk/live-helper/examples/live-snapshot.sources.list
   dists/trunk/live-helper/examples/live.sources.list
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
   dists/trunk/live-helper/helpers/lh_chroot_sources
   dists/trunk/live-helper/helpers/lh_config
   dists/trunk/live-helper/helpers/make-live
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-05-09 07:21:59 UTC (rev 1415)
@@ -1,3 +1,11 @@
+2007-05-09  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP.
+	  - Renamed LH_MIRROR*_IMAGE to LH_MIRROR*_BINARY.
+	* helpers/lh_chroot_sources:
+	  - Changed checks for *.build/*.image to *.bootstrap/*.binary.
+
 2007-05-08  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/*:

Modified: dists/trunk/live-helper/examples/beryl.sources.list
===================================================================
--- dists/trunk/live-helper/examples/beryl.sources.list	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/examples/beryl.sources.list	2007-05-09 07:21:59 UTC (rev 1415)
@@ -2,7 +2,7 @@
 ## Beryl Etch repository.
 ##
 ## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. beryl.build and once as beryl.image.
+## as e.g. beryl.bootstrap and once as beryl.binary.
 ## Additionally, you need to copy the beryl-hook.sh file to your
 ## config/chroot_localhooks directory.
 ##

Modified: dists/trunk/live-helper/examples/bpo.sources.list
===================================================================
--- dists/trunk/live-helper/examples/bpo.sources.list	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/examples/bpo.sources.list	2007-05-09 07:21:59 UTC (rev 1415)
@@ -2,7 +2,7 @@
 ## Debian Etch backports repository.
 ##
 ## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. bpo.build and once as bpo.image.
+## as e.g. bpo.bootstrap and once as bpo.binary.
 
 # Debian backports for Etch
 deb http://www.backports.org/debian/ etch-backports main

Modified: dists/trunk/live-helper/examples/edu.sources.list
===================================================================
--- dists/trunk/live-helper/examples/edu.sources.list	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/examples/edu.sources.list	2007-05-09 07:21:59 UTC (rev 1415)
@@ -2,7 +2,7 @@
 ## Debian Edu/Skolelinux repository.
 ##
 ## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. edu.build and once as edu.image.
+## as e.g. edu.bootstrap and once as edu.binary.
 ##
 ## Remeber to add debian-edu-archive-keyring to your package selection.
 

Modified: dists/trunk/live-helper/examples/fai.sources.list
===================================================================
--- dists/trunk/live-helper/examples/fai.sources.list	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/examples/fai.sources.list	2007-05-09 07:21:59 UTC (rev 1415)
@@ -2,7 +2,7 @@
 ## FAI - Fully Automated Install repository.
 ##
 ## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. fai.build and once as fai.image.
+## as e.g. fai.bootstrap and once as fai.binary.
 
 # FAI - Fully Automated Install
 deb http://www.informatik.uni-koeln.de/fai/download/ etch koeln

Modified: dists/trunk/live-helper/examples/live-snapshot.sources.list
===================================================================
--- dists/trunk/live-helper/examples/live-snapshot.sources.list	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/examples/live-snapshot.sources.list	2007-05-09 07:21:59 UTC (rev 1415)
@@ -2,7 +2,7 @@
 ## Debian Live Snapshot repository.
 ##
 ## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live-snapshot.build and once as live-snapshot.image.
+## as e.g. live-snapshot.bootstrap and once as live-snapshot.binary.
 
 # Debian Live Snapshots
 deb http://live.debian.net/debian-snapshot/ ./

Modified: dists/trunk/live-helper/examples/live.sources.list
===================================================================
--- dists/trunk/live-helper/examples/live.sources.list	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/examples/live.sources.list	2007-05-09 07:21:59 UTC (rev 1415)
@@ -2,7 +2,7 @@
 ## Debian Live Etch backports repository.
 ##
 ## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live.build and once as live.image.
+## as e.g. live.bootstrap and once as live.binary.
 ##
 ## Remeber to add debian-unofficial-archive-keyring to your package selection.
 

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-05-09 07:21:59 UTC (rev 1415)
@@ -287,57 +287,57 @@
 	fi
 
 	# Setting mirror to fetch packages from
-	if [ -z "${LIVE_MIRROR_BUILD}" ]
+	if [ -z "${LIVE_MIRROR_BOOTSTRAP}" ]
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_MIRROR_BUILD="http://ftp.debian.org/debian/"
+				LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
 				;;
 
 			ubuntu)
-				LIVE_MIRROR_BUILD="http://archive.ubuntu.com/ubuntu/"
+				LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
 				;;
 		esac
 	fi
 
 	# Setting security mirror to fetch packages from
-	if [ -z "${LIVE_MIRROR_BUILD_SECURITY}" ]
+	if [ -z "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" ]
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_MIRROR_BUILD_SECURITY="http://security.debian.org/"
+				LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
 				;;
 
 			ubuntu)
-				LIVE_MIRROR_BUILD_SECURITY="http://security.ubuntu.org/ubuntu/"
+				LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.ubuntu.org/ubuntu/"
 				;;
 		esac
 	fi
 
 	# Setting mirror which ends up in the image
-	if [ -z "${LIVE_MIRROR_IMAGE}" ]
+	if [ -z "${LIVE_MIRROR_BINARY}" ]
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_MIRROR_IMAGE="http://ftp.debian.org/debian/"
+				LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/"
 				;;
 
 			ubuntu)
-				LIVE_MIRROR_IMAGE="http://archive.ubuntu.com/ubuntu/"
+				LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
 				;;
 		esac
 	fi
 
 	# Setting security mirror which ends up in the image
-	if [ -z "${LIVE_MIRROR_IMAGE_SECURITY}" ]
+	if [ -z "${LIVE_MIRROR_BINARY_SECURITY}" ]
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_MIRROR_IMAGE_SECURITY="http://security.debian.org/"
+				LIVE_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 				;;
 
 			ubuntu)
-				LIVE_MIRROR_IMAGE_SECURITY="http://security.ubuntu.com/ubuntu/"
+				LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
 				;;
 		esac
 	fi

Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-05-09 07:21:59 UTC (rev 1415)
@@ -97,16 +97,16 @@
 # Downloading debian-installer
 mkdir -p "${DESTDIR}"
 
-wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
 
 # Downloading graphical-installer
 if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
 then
 	mkdir -p "${DESTDIR}"/gtk
 
-	wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
-	wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+	wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
 fi
 
 FIXME ()
@@ -114,7 +114,7 @@
 # Downloading udebs
 mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
 cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-wget "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
 gunzip -c Packages.gz > Packages
 cd "${OLDPWD}"
 
@@ -132,7 +132,7 @@
 do
 	mkdir -p binary/`dirname ${UDEB}`
 	cd binary/`dirname ${UDEB}`
-	wget "${LIVE_MIRROR_BUILD}"/${UDEB}
+	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
 	cd "${OLDPWD}"
 done
 

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-05-09 07:21:59 UTC (rev 1415)
@@ -120,7 +120,7 @@
 		fi
 
 		# Executing cdebootstrap (download-only)
-		${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
+		${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
 
 		if [ -n "${LH_ROOT_COMMAND}" ]
 		then
@@ -143,7 +143,7 @@
 	fi
 
 	# Executing cdebootstrap (regular run)
-	${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
+	${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
 
 	if [ -n "${LH_ROOT_COMMAND}" ]
 	then

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-05-09 07:21:59 UTC (rev 1415)
@@ -103,7 +103,7 @@
 		fi
 
 		# Executing debootstrap (download-only)
-		${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+		${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
 
 		if [ -n "${LH_ROOT_COMMAND}" ]
 		then
@@ -126,7 +126,7 @@
 	fi
 
 	# Executing debootstrap (regular run)
-	${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+	${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
 
 	if [ -n "${LH_ROOT_COMMAND}" ]
 	then

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-05-09 07:21:59 UTC (rev 1415)
@@ -49,11 +49,11 @@
 		Create_lockfile .lock
 
 		# Configure custom sources.list
-		echo "deb ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+		echo "deb ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
 
 		if [ "${LIVE_SOURCE}" = "enabled" ]
 		then
-			echo "deb-src ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+			echo "deb-src ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 		fi
 
 		if [ "${LIVE_SECURITY}" = "enabled" ]
@@ -62,74 +62,74 @@
 				debian)
 					if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
 					then
-						echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+						echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
 						if [ "${LIVE_SOURCE}" = "enabled" ]
 						then
-							echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+							echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 						fi
 					fi
 					;;
 
 				ubuntu)
-					echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+					echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
 					if [ "${LIVE_SOURCE}" = "enabled" ]
 					then
-						echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+						echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 					fi
 					;;
 			esac
 		fi
 
 		# Check local sources.list
-		if ls config/chroot_sources/*.build &> /dev/null
+		if ls config/chroot_sources/*.bootstrap &> /dev/null
 		then
 			echo "" >> chroot/etc/apt/sources.list
 			echo "# Custom repositories" >> chroot/etc/apt/sources.list
 
-			for FILE in config/chroot_sources/*.build
+			for FILE in config/chroot_sources/*.bootstrap
 			do
 				cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
 			done
 		fi
 
 		# Update indices from cache
-		if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_build ]
+		if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
 		then
-			if ls cache/indices_build/secring.gpg* &> /dev/null
+			if ls cache/indices_bootstrap/secring.gpg* &> /dev/null
 			then
-				cp -f cache/indices_build/secring.gpg* chroot/etc/apt
+				cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
 			fi
 
-			if ls cache/indices_build/trusted.gpg* &> /dev/null
+			if ls cache/indices_bootstrap/trusted.gpg* &> /dev/null
 			then
-				cp -f cache/indices_build/trusted.gpg* chroot/etc/apt
+				cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
 			fi
 
-			if [ -f cache/indices_build/pkgcache.bin ]
+			if [ -f cache/indices_bootstrap/pkgcache.bin ]
 			then
-				cp -f cache/indices_build/pkgcache.bin chroot/var/cache/apt
+				cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
 			fi
 
-			if [ -f cache/indices_build/srcpkgcache.bin ]
+			if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
 			then
-				cp -f cache/indices_build/srcpkgcache.bin chroot/var/cache/apt
+				cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
 			fi
 
-			if ls cache/indices_build/*_Packages &> /dev/null
+			if ls cache/indices_bootstrap/*_Packages &> /dev/null
 			then
-				cp -f cache/indices_build/*_Packages chroot/var/lib/apt/lists
+				cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
 			fi
 
-			if ls cache/indices_build/*_Sources &> /dev/null
+			if ls cache/indices_bootstrap/*_Sources &> /dev/null
 			then
-				cp -f cache/indices_build/*_Sources chroot/var/lib/apt/lists
+				cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
 			fi
 
-			if ls cache/indices_build/*_Release* &> /dev/null
+			if ls cache/indices_bootstrap/*_Release* &> /dev/null
 			then
-				cp -f cache/indices_build/*_Release* chroot/var/lib/apt/lists
+				cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
 			fi
 
 			if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
@@ -138,9 +138,9 @@
 			fi
 		else # Get fresh indices
 			# Check local gpg keys
-			if ls config/chroot_sources/*.build.gpg &> /dev/null
+			if ls config/chroot_sources/*.bootstrap.gpg &> /dev/null
 			then
-				for FILE in config/chroot_sources/*.build.gpg
+				for FILE in config/chroot_sources/*.bootstrap.gpg
 				do
 					cp ${FILE} chroot/root
 					Chroot "apt-key add /root/`basename ${FILE}`"
@@ -183,20 +183,20 @@
 
 			if [ "${LH_CACHE_INDICES}" = "enabled" ]
 			then
-				if [ ! -d cache/indices_build ]
+				if [ ! -d cache/indices_bootstrap ]
 				then
-					mkdir -p cache/indices_build
+					mkdir -p cache/indices_bootstrap
 				fi
 
-				cp -f chroot/etc/apt/secring.gpg* cache/indices_build
-				cp -f chroot/etc/apt/trusted.gpg* cache/indices_build
+				cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
+				cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
 
-				cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_build
-				cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_build
+				cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
+				cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
 
-				cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_build
-				cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_build
-				cp -f chroot/var/lib/apt/*_Release* cache/indices_build
+				cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
+				cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
+				cp -f chroot/var/lib/apt/*_Release* cache/indices_bootstrap
 			fi
 		fi
 
@@ -215,8 +215,8 @@
 		if [ "${LH_APT_GENERIC}" = "enabled" ]
 		then
 			# Don't do anything if it's not required
-			if [ "${LIVE_MIRROR_BUILD}" = "${LIVE_MIRROR_IMAGE}" ] && \
-			[ "${LIVE_MIRROR_BUILD_SECURITY}" = "${LIVE_MIRROR_IMAGE_SECURITY}" ]
+			if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \
+			[ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ]
 			then
 				exit 0
 			fi
@@ -225,11 +225,11 @@
 			rm -rf chroot/var/lib/apt/lists
 			mkdir -p chroot/var/lib/apt/lists/partial
 
-			echo "deb ${LIVE_MIRROR_IMAGE} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+			echo "deb ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
 
 			if [ "${LIVE_SOURCE}" = "enabled" ]
 			then
-				echo "deb-src ${LIVE_MIRROR_IMAGE} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+				echo "deb-src ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 			fi
 
 			if [ "${LIVE_SECURITY}" = "enabled" ]
@@ -238,42 +238,42 @@
 					debian)
 						if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
 						then
-							echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+							echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
 							if [ "${LIVE_SOURCE}" = "enabled" ]
 							then
-								echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+								echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 							fi
 						fi
 						;;
 
 					ubuntu)
-						echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+						echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
 						if [ "${LIVE_SOURCE}" = "enabled" ]
 						then
-							echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+							echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 						fi
 						;;
 				esac
 			fi
 
 			# Check local sources.list
-			if ls config/chroot_sources/*.image &> /dev/null
+			if ls config/chroot_sources/*.binary &> /dev/null
 			then
 				echo "" >> chroot/etc/apt/sources.list
 				echo "# Custom repositories" >> chroot/etc/apt/sources.list
 
-				for FILE in config/chroot_sources/*.image
+				for FILE in config/chroot_sources/*.binary
 				do
 					cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
 				done
 			fi
 
 			# Check local gpg keys
-			if ls config/chroot_sources/*.image.gpg &> /dev/null
+			if ls config/chroot_sources/*.binary.gpg &> /dev/null
 			then
-				for FILE in config/chroot_sources/*.image.gpg
+				for FILE in config/chroot_sources/*.binary.gpg
 				do
 					cp ${FILE} chroot/root
 					Chroot "apt-key add /root/`basename ${FILE}`"

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/helpers/lh_config	2007-05-09 07:21:59 UTC (rev 1415)
@@ -257,21 +257,21 @@
 # (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
 LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
 
-# \$LIVE_MIRROR_BUILD: set the mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BUILD})
-LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}"
+# \$LIVE_MIRROR_BOOTSTRAP: set the mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP})
+LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
 
-# \$LIVE_MIRROR_BUILD_SECURITY: set the security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BUILD_SECURITY})
-LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}"
+# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set the security mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
+LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
 
-# \$LIVE_MIRROR_IMAGE: set the mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_IMAGE})
-LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}"
+# \$LIVE_MIRROR_BINARY: set the mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY})
+LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
 
-# \$LIVE_MIRROR_IMAGE_SECURITY: set the security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_IMAGE_SECURITY})
-LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}"
+# \$LIVE_MIRROR_BINARY_SECURITY: set the security mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
+LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
 
 # \$LIVE_SECTIONS: select the section(s) to use
 # (Default: ${LIVE_SECTIONS})

Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live	2007-05-09 07:14:29 UTC (rev 1414)
+++ dists/trunk/live-helper/helpers/make-live	2007-05-09 07:21:59 UTC (rev 1415)
@@ -31,13 +31,13 @@
 # Set static variables
 PROGRAM="`basename ${0}`"
 DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb-hdd|net] [-s|--source-image generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb-hdd|net] [-s|--source-image generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
 
 HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
 
 Local_arguments ()
 {
-	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
 
 	if [ "${?}" != "0" ]
 	then
@@ -150,20 +150,20 @@
 				LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
 				;;
 
-			-m|--mirror-build)
-				LIVE_MIRROR_BUILD="${2}"; shift 2
+			-m|--mirror-bootstrap)
+				LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
 				;;
 
-			--mirror-build-security)
-				LIVE_MIRROR_BUILD_SECURITY="${2}"; shift 2
+			--mirror-bootstrap-security)
+				LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
 				;;
 
-			--mirror-image)
-				LIVE_MIRROR_IMAGE="${2}"; shift 2
+			--mirror-binary)
+				LIVE_MIRROR_BINARY="${2}"; shift 2
 				;;
 
-			--mirror-image-security)
-				LIVE_MIRROR_IMAGE_SECURITY="${2}"; shift 2
+			--mirror-binary-security)
+				LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
 				;;
 
 			--sections)
@@ -353,7 +353,7 @@
 	Local_arguments "${@}"
 
 	# Configuring (this is really shit!)
-	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
+	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
 
 	if [ "${LH_BREAKPOINTS}" = "enabled" ]
 	then




More information about the Debian-live-changes mailing list