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

daniel at alioth.debian.org daniel at alioth.debian.org
Tue May 29 07:59:09 UTC 2007 

Author: daniel
Date: 2007-05-29 07:59:09 +0000 (Tue, 29 May 2007)
New Revision: 1863

Modified:
   dists/trunk/live-helper/helpers/lh_binary_chroot
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
   dists/trunk/live-helper/helpers/lh_binary_encryption
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_hdd
   dists/trunk/live-helper/helpers/lh_binary_includes
   dists/trunk/live-helper/helpers/lh_binary_iso
   dists/trunk/live-helper/helpers/lh_binary_linux-image
   dists/trunk/live-helper/helpers/lh_binary_local-includes
   dists/trunk/live-helper/helpers/lh_binary_manifest
   dists/trunk/live-helper/helpers/lh_binary_md5sum
   dists/trunk/live-helper/helpers/lh_binary_memtest
   dists/trunk/live-helper/helpers/lh_binary_net
   dists/trunk/live-helper/helpers/lh_binary_rootfs
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_binary_usb-hdd
   dists/trunk/live-helper/helpers/lh_binary_yaboot
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
   dists/trunk/live-helper/helpers/lh_chroot_apt
   dists/trunk/live-helper/helpers/lh_chroot_debianchroot
   dists/trunk/live-helper/helpers/lh_chroot_hacks
   dists/trunk/live-helper/helpers/lh_chroot_hooks
   dists/trunk/live-helper/helpers/lh_chroot_hosts
   dists/trunk/live-helper/helpers/lh_chroot_interactive
   dists/trunk/live-helper/helpers/lh_chroot_linux-image
   dists/trunk/live-helper/helpers/lh_chroot_local-hooks
   dists/trunk/live-helper/helpers/lh_chroot_local-includes
   dists/trunk/live-helper/helpers/lh_chroot_local-packages
   dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
   dists/trunk/live-helper/helpers/lh_chroot_localization
   dists/trunk/live-helper/helpers/lh_chroot_packages
   dists/trunk/live-helper/helpers/lh_chroot_packageslists
   dists/trunk/live-helper/helpers/lh_chroot_proc
   dists/trunk/live-helper/helpers/lh_chroot_resolv
   dists/trunk/live-helper/helpers/lh_chroot_sources
   dists/trunk/live-helper/helpers/lh_chroot_symlinks
   dists/trunk/live-helper/helpers/lh_chroot_sysfs
   dists/trunk/live-helper/helpers/lh_chroot_sysvinit
   dists/trunk/live-helper/helpers/lh_chroot_sysvrc
   dists/trunk/live-helper/helpers/lh_chroot_tasks
   dists/trunk/live-helper/helpers/lh_source_debian
   dists/trunk/live-helper/helpers/lh_source_debian-live
   dists/trunk/live-helper/helpers/lh_source_generic
   dists/trunk/live-helper/helpers/lh_source_hdd
   dists/trunk/live-helper/helpers/lh_source_iso
   dists/trunk/live-helper/helpers/lh_source_md5sum
   dists/trunk/live-helper/helpers/lh_source_net
   dists/trunk/live-helper/helpers/lh_source_usb-hdd
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_chroot	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,9 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin copying chroot..."
-Echo_message "This may take a while."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -33,6 +30,9 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin copying chroot..."
+Echo_message "This may take a while."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing debian-installer..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin installing debian-installer..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin encrypting root filesystem image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin encrypting root filesystem image..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 Require_stagefile .stage/binary_rootfs

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing grub..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin installing grub..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hdd	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_hdd	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building binary harddisk image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,32 +30,32 @@
 Read_conffile config/source
 Set_defaults
 
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs hdd
+then
+	exit 0
+fi
 
-for IMAGE in ${LIVE_BINARY_IMAGES}
-do
-	if [ "${IMAGE}" = "hdd" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/bootstrap
+Echo_message "Begin building binary harddisk image..."
 
-		# Checking stage file
-		Check_stagefile .stage/binary_hdd
+# Requiring stage file
+Require_stagefile .stage/bootstrap
 
-		# Checking lock file
-		Check_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/binary_hdd
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking lock file
+Check_lockfile .lock
 
-		# Remove old binary
-		if [ -f binary-hdd.tar.gz ]
-		then
-			rm -f binary-hdd.tar.gz
-		fi
+# Creating lock file
+Create_lockfile .lock
 
-		tar cfz binary-hdd.tar.gz binary
+# Remove old binary
+if [ -f binary-hdd.tar.gz ]
+then
+	rm -f binary-hdd.tar.gz
+fi
 
-		# Creating stage file
-		Create_stagefile .stage/binary_hdd
-	fi
-done
+tar cfz binary-hdd.tar.gz binary
+
+# Creating stage file
+Create_stagefile .stage/binary_hdd

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin copying binary includes..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin copying binary includes..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building binary iso image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,107 +30,108 @@
 Read_conffile config/source
 Set_defaults
 
-for IMAGE in ${LIVE_BINARY_IMAGES}
-do
-	if [ "${IMAGE}" = "iso" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/bootstrap
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs iso
+then
+	exit 0
+fi
 
-		# Checking stage file
-		Check_stagefile .stage/binary_iso
+Echo_message "Begin building binary iso image..."
 
-		# Checking lock file
-		Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/bootstrap
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/binary_iso
 
-		# Checking depends
-		Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+# Checking lock file
+Check_lockfile .lock
 
-		# Installing depends
-		Install_package
+# Creating lock file
+Create_lockfile .lock
 
-		# Remove old iso image
-		if [ -f binary.iso ]
-		then
-			rm -f binary.iso
-		fi
+# Checking depends
+Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
 
-		if [ "${LH_VERBOSE}" = "enabled" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
-		fi
+# Installing depends
+Install_package
 
-		if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
-		fi
+# Remove old iso image
+if [ -f binary.iso ]
+then
+	rm -f binary.iso
+fi
 
-		if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
-		fi
+if [ "${LH_VERBOSE}" = "enabled" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
 
-		if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
-		fi
+if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+fi
 
-		if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
-		fi
+if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+fi
 
-		# Moving image
-		mv binary chroot
+if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+fi
 
-		# Create image
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
-		then
-			case "${LIVE_BOOTLOADER}" in
-				grub)
-					GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
+if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+fi
 
-					if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
-					then
-						GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
-					fi
-					;;
+# Moving image
+mv binary chroot
 
-				syslinux)
-					GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+# Create image
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
+then
+	case "${LIVE_BOOTLOADER}" in
+		grub)
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
 
-					if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
-					then
-						GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
-					fi
-					;;
+			if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+			then
+				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
+			fi
+			;;
 
-				*)
-					Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
-					sleep 5
-					;;
-			esac
+		syslinux)
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
 
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		fi
+			if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+			then
+				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
+			fi
+			;;
 
+		*)
+			Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+			sleep 5
+			;;
+	esac
+
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+fi
+
 cat >> chroot/binary.sh << EOF
 ${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
 EOF
 
-		Chroot "sh binary.sh"
+Chroot "sh binary.sh"
 
-		# Move image
-		mv chroot/binary chroot/binary.iso ./
-		rm -f chroot/binary.sh
+# Move image
+mv chroot/binary chroot/binary.iso ./
+rm -f chroot/binary.sh
 
-		# Removing depends
-		Remove_package
+# Removing depends
+Remove_package
 
-		# Creating stage file
-		Create_stagefile .stage/binary_iso
-	fi
-done
+# Creating stage file
+Create_stagefile .stage/binary_iso

Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin install linux-image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin install linux-image..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_local-includes	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_local-includes	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin copying binary local includes..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin copying binary local includes..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_manifest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_manifest	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_manifest	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin creating manifest..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin creating manifest..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_md5sum	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_md5sum	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin creating binary md5sum.txt..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin creating binary md5sum.txt..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing memtest..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin installing memtest..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_net	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building binary netboot image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,49 +30,50 @@
 Read_conffile config/source
 Set_defaults
 
-for IMAGE in ${LIVE_BINARY_IMAGES}
-do
-	if [ "${IMAGE}" = "net" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/bootstrap
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs net
+then
+	exit 0
+fi
 
-		# Checking stage file
-		Check_stagefile .stage/binary_net
+Echo_message "Begin building binary netboot image..."
 
-		# Checking lock file
-		Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/bootstrap
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/binary_net
 
-		# Remove old binary
-		if [ -f binary-net.tar.gz ]
-		then
-			rm -f binary-net.tar.gz
-		fi
+# Checking lock file
+Check_lockfile .lock
 
-		# Creating image file
-		if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
-		then
-			mv chroot chroot.tmp
-		fi
+# Creating lock file
+Create_lockfile .lock
 
-		mv binary "`basename ${LIVE_NET_PATH}`"
+# Remove old binary
+if [ -f binary-net.tar.gz ]
+then
+	rm -f binary-net.tar.gz
+fi
 
-		cd ..
-		tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
-		mv binary-net.tar.gz "${OLDPWD}"
-		cd "${OLDPWD}"
+# Creating image file
+if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+then
+	mv chroot chroot.tmp
+fi
 
-		mv "`basename ${LIVE_NET_PATH}`" binary
+mv binary "`basename ${LIVE_NET_PATH}`"
 
-		if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
-		then
-			mv chroot.tmp chroot
-		fi
+cd ..
+tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
+mv binary-net.tar.gz "${OLDPWD}"
+cd "${OLDPWD}"
 
-		# Creating stage file
-		Create_stagefile .stage/binary_net
-	fi
-done
+mv "`basename ${LIVE_NET_PATH}`" binary
+
+if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
+then
+	mv chroot.tmp chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_net

Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building root filesystem image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin building root filesystem image..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 Require_stagefile .stage/binary_chroot

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing syslinux..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin installing syslinux..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_binary_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb-hdd	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_usb-hdd	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building binary usb-hdd image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,125 +30,126 @@
 Read_conffile config/source
 Set_defaults
 
-for IMAGE in ${LIVE_BINARY_IMAGES}
-do
-	if [ "${IMAGE}" = "usb-hdd" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/bootstrap
-		Require_stagefile .stage/chroot_proc
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs usb-hdd
+then
+	exit 0
+fi
 
-		# Checking stage file
-		Check_stagefile .stage/binary_usb-hdd
+Echo_message "Begin building binary usb-hdd image..."
 
-		# Checking lock file
-		Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+Require_stagefile .stage/chroot_proc
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/binary_usb-hdd
 
-		# Checking depends
-		Check_package chroot/sbin/mkdosfs dosfstools
-		Check_package chroot/usr/sbin/mtools mtools
-		Check_package chroot/sbin/parted parted
+# Checking lock file
+Check_lockfile .lock
 
-		case "${LIVE_BOOTLOADER}" in
-			grub)
-				Check_package chroot/usr/sbin/grub grub
-				;;
+# Creating lock file
+Create_lockfile .lock
 
-			syslinux)
-				Check_package chroot/usr/bin/syslinux syslinux
-				;;
-		esac
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/usr/sbin/mtools mtools
+Check_package chroot/sbin/parted parted
 
-		# Installing depends
-		Install_package
+case "${LIVE_BOOTLOADER}" in
+	grub)
+		Check_package chroot/usr/sbin/grub grub
+		;;
 
-		# Remove old binary
-		if [ -f binary.img ]
-		then
-			rm -f binary.img
-		fi
+	syslinux)
+		Check_package chroot/usr/bin/syslinux syslinux
+		;;
+esac
 
-		# Everything which comes here needs to be cleaned up,
-		DU_DIM="`du -ms binary | cut -f1`"
-		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
-		dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
-		FREELO="`${LH_LOSETUP} -f`"
-		if [ ! -b chroot/${FREELO} ]
-		then
-			MAKEDEV="true"
+# Installing depends
+Install_package
 
-			mv chroot/dev chroot/dev.tmp
-			find /dev | cpio -dmpu chroot
-		fi
+# Remove old binary
+if [ -f binary.img ]
+then
+	rm -f binary.img
+fi
 
-		echo "!!! The following error/warning messages can be ignored !!!"
-		lh_losetup $FREELO binary.img 0
-		Chroot "parted -s ${FREELO} mklabel msdos" || true
-		Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
-		Chroot "parted -s ${FREELO} set 1 boot on" || true
-		Chroot "parted -s ${FREELO} set 1 lba off" || true
+# Everything which comes here needs to be cleaned up,
+DU_DIM="`du -ms binary | cut -f1`"
+REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
+dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
+FREELO="`${LH_LOSETUP} -f`"
+if [ ! -b chroot/${FREELO} ]
+then
+	MAKEDEV="true"
 
-		case "${LIVE_BOOTLOADER}" in
-			grub)
-				#echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
+	mv chroot/dev chroot/dev.tmp
+	find /dev | cpio -dmpu chroot
+fi
+
+echo "!!! The following error/warning messages can be ignored !!!"
+lh_losetup $FREELO binary.img 0
+Chroot "parted -s ${FREELO} mklabel msdos" || true
+Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+Chroot "parted -s ${FREELO} set 1 boot on" || true
+Chroot "parted -s ${FREELO} set 1 lba off" || true
+
+case "${LIVE_BOOTLOADER}" in
+	grub)
+		#echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
 #grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
 #setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
 #
 #quit
 #EOF
-				#rm -f binary/boot/grub/device.map 
+		#rm -f binary/boot/grub/device.map
 
-				#Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
-				;;
+		#Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
+		;;
 
-			syslinux)
-				cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
-				;;
-		esac
+	syslinux)
+		cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
+		;;
+esac
 
-		${LH_LOSETUP} -d ${FREELO}
+${LH_LOSETUP} -d ${FREELO}
 
-		FREELO="`${LH_LOSETUP} -f`"
-		lh_losetup $FREELO binary.img 1
-		Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
-		mkdir -p binary.tmp
-		${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
-		cp -r binary/* binary.tmp
-		${LH_ROOT_COMMAND} umount binary.tmp
-		rmdir binary.tmp
+FREELO="`${LH_LOSETUP} -f`"
+lh_losetup $FREELO binary.img 1
+Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+mkdir -p binary.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
+cp -r binary/* binary.tmp
+${LH_ROOT_COMMAND} umount binary.tmp
+rmdir binary.tmp
 
-		if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-		then
-			Chroot "syslinux ${FREELO}"
-		fi
+if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+then
+	Chroot "syslinux ${FREELO}"
+fi
 
-		${LH_LOSETUP} -d ${FREELO}
+${LH_LOSETUP} -d ${FREELO}
 
-		#if [ "${LIVE_BOOTLOADER}" = "grub" ]
-		#then
-		#	FREELO="`${LH_LOSETUP} -f`"
-		#	lh_losetup $FREELO binary.img 0
+#if [ "${LIVE_BOOTLOADER}" = "grub" ]
+#then
+#	FREELO="`${LH_LOSETUP} -f`"
+#	lh_losetup $FREELO binary.img 0
 
-		#	dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
-		#	dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
+#	dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
+#	dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
 
-		#	${LH_LOSETUP} -d ${FREELO}
-		#fi
-		echo "!!! The above error/warning messages can be ignored !!!"
+#	${LH_LOSETUP} -d ${FREELO}
+#fi
+echo "!!! The above error/warning messages can be ignored !!!"
 
-		if [ -n "${MAKEDEV}" ]
-		then
-			rm -f chroot/dev
-			mv chroot/dev.tmp chroot/dev
-		fi
+if [ -n "${MAKEDEV}" ]
+then
+	rm -f chroot/dev
+	mv chroot/dev.tmp chroot/dev
+fi
 
-		# Removing depends
-		Remove_package
+# Removing depends
+Remove_package
 
-		# Creating stage file
-		Create_stagefile .stage/binary_usb-hdd
-	fi
-done
+# Creating stage file
+Create_stagefile .stage/binary_usb-hdd

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing yaboot..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin installing yaboot..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin bootstrapping system..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin bootstrapping system..."
+
 # Ensure that a system is built as root
 lh_testroot
 

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin bootstrapping system..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin bootstrapping system..."
+
 # Ensure that a system is built as root
 lh_testroot
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_apt	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin configuring /etc/apt/apt.conf..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin configuring /etc/apt/apt.conf..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_debianchroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_debianchroot	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_debianchroot	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin configuring /etc/debian_chroot..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin configuring /etc/debian_chroot..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin executing hacks..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin executing hacks..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin executing hooks..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin executing hooks..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_hosts
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hosts	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_hosts	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin configuring /etc/hosts..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin configuring /etc/hosts..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_interactive
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_interactive	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_interactive	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin interactive build..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin interactive build..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_linux-image	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_linux-image	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin configuring /etc/kernel-img.conf..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin configuring /etc/kernel-img.conf..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin executing local hooks..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin executing local hooks..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-includes	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-includes	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin copying chroot local includes..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin copying chroot local includes..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packages	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packages	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing local packages..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin installing local packages..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packageslists	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packageslists	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing local packages lists..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin installing local packages lists..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_localization	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing localization packages..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin installing localization packages..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packages	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_packages	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing packages..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin installing packages..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing packages lists..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin installing packages lists..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_proc	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin mounting /proc..."
-
 # Ensure that a system is built as root
 lh_testroot
 
@@ -35,6 +33,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin mounting /proc..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_resolv	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin configuring /etc/resolv.conf..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin configuring /etc/resolv.conf..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin configuring /etc/apt/sources.list..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin configuring /etc/apt/sources.list..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_symlinks	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin converting symlinks..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin converting symlinks..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysfs	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin mounting /sys..."
-
 # Ensure that a system is built as root
 lh_testroot
 
@@ -35,6 +33,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin mounting /sys..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvinit
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvinit	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvinit	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin configuring sysvinit..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin configuring sysvinit..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvrc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvrc	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvrc	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin configuring /usr/sbin/policy-rc.d..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin configuring /usr/sbin/policy-rc.d..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin installing tasks..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,6 +30,8 @@
 Read_conffile config/source
 Set_defaults
 
+Echo_message "Begin installing tasks..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_source_debian
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_source_debian	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin downloading sources..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin downloading sources..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_source_debian-live
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian-live	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_source_debian-live	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin copying live-helper configuration..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin copying live-helper configuration..."
+
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_source_generic
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_generic	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_source_generic	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,9 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building source generic image..."
-Echo_message "This may take a while."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -38,32 +35,34 @@
 	exit 0
 fi
 
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
-	if [ "${IMAGE}" = "generic" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/source_debian
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs generic
+then
+        exit 0
+fi
 
-		# Checking stage file
-		Check_stagefile .stage/source_generic
+Echo_message "Begin building source generic image..."
+Echo_message "This may take a while."
 
-		# Checking lock file
-		Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_debian
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_generic
 
-		# Remove old source
-		if [ -f source.tar ]
-		then
-			rm -f source.tar
-		fi
+# Checking lock file
+Check_lockfile .lock
 
-		# Create tarball
-		tar cf source.tar source
+# Creating lock file
+Create_lockfile .lock
 
-		# Creating stage file
-		Create_stagefile .stage/source_generic
-	fi
-done
+# Remove old source
+if [ -f source.tar ]
+then
+	rm -f source.tar
+fi
+
+# Create tarball
+tar cf source.tar source
+
+# Creating stage file
+Create_stagefile .stage/source_generic

Modified: dists/trunk/live-helper/helpers/lh_source_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_hdd	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_source_hdd	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,9 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building source harddisk image..."
-Echo_message "This may take a while."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -38,32 +35,34 @@
 	exit 0
 fi
 
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
-	if [ "${IMAGE}" = "hdd" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/source_debian
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd
+then
+        exit 0
+fi
 
-		# Checking stage file
-		Check_stagefile .stage/source_hdd
+Echo_message "Begin building source harddisk image..."
+Echo_message "This may take a while."
 
-		# Checking lock file
-		Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_debian
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_hdd
 
-		# Remove old source
-		if [ -f source-hdd.tar.gz ]
-		then
-			rm -f source-hdd.tar.gz
-		fi
+# Checking lock file
+Check_lockfile .lock
 
-		# Create tarball
-		tar cfz source-hdd.tar.gz source
+# Creating lock file
+Create_lockfile .lock
 
-		# Creating stage file
-		Create_stagefile .stage/source_hdd
-	fi
-done
+# Remove old source
+if [ -f source-hdd.tar.gz ]
+then
+	rm -f source-hdd.tar.gz
+fi
+
+# Create tarball
+tar cfz source-hdd.tar.gz source
+
+# Creating stage file
+Create_stagefile .stage/source_hdd

Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_source_iso	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building source iso image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,76 +35,77 @@
 	exit 0
 fi
 
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
-	if [ "${IMAGE}" = "iso" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/source_debian
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs iso
+then
+        exit 0
+fi
 
-		# Checking stage file
-		Check_stagefile .stage/source_iso
+Echo_message "Begin building source iso image..."
 
-		# Checking lock file
-		Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_debian
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_iso
 
-		# Checking depends
-		Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+# Checking lock file
+Check_lockfile .lock
 
-		# Installing depends
-		Install_package
+# Creating lock file
+Create_lockfile .lock
 
-		# Remove old iso image
-		if [ -f source.iso ]
-		then
-			rm -f source.iso
-		fi
+# Checking depends
+Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
 
-		if [ "${LH_VERBOSE}" = "enabled" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
-		fi
+# Installing depends
+Install_package
 
-		if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
-		fi
+# Remove old iso image
+if [ -f source.iso ]
+then
+	rm -f source.iso
+fi
 
-		if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
-		fi
+if [ "${LH_VERBOSE}" = "enabled" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
 
-		if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
-		fi
+if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\""
+fi
 
-		if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
-		then
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
-		fi
+if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\""
+fi
 
-		# Moving image
-		mv source chroot
+if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\""
+fi
 
+if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
+fi
+
+# Moving image
+mv source chroot
+
 cat >> chroot/source.sh << EOF
 ${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
 EOF
 
-		Chroot "sh source.sh"
+Chroot "sh source.sh"
 
-		# Move image
-		mv chroot/source chroot/source.iso ./
-		rm -f chroot/source.sh
+# Move image
+mv chroot/source chroot/source.iso ./
+rm -f chroot/source.sh
 
-		# Removing depends
-		Remove_package
+# Removing depends
+Remove_package
 
-		# Creating stage file
-		Create_stagefile .stage/source_iso
-	fi
-done
+# Creating stage file
+Create_stagefile .stage/source_iso

Modified: dists/trunk/live-helper/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_source_md5sum	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin creating source md5sum.txt..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,6 +35,8 @@
 	exit 0
 fi
 
+Echo_message "Begin creating source md5sum.txt..."
+
 # Requiring stage file
 Require_stagefile .stage/source_debian
 

Modified: dists/trunk/live-helper/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_source_net	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building source netboot image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,32 +35,33 @@
 	exit 0
 fi
 
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
-	if [ "${IMAGE}" = "net" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/source_debian
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs net
+then
+        exit 0
+fi
 
-		# Checking stage file
-		Check_stagefile .stage/source_net
+Echo_message "Begin building source netboot image..."
 
-		# Checking lock file
-		Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_debian
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_net
 
-		# Remove old source
-		if [ -f source-net.tar.gz ]
-		then
-			rm -f source-net.tar.gz
-		fi
+# Checking lock file
+Check_lockfile .lock
 
-		# Create tarball
-		tar cfz source-net.tar.gz source
+# Creating lock file
+Create_lockfile .lock
 
-		# Creating stage file
-		Create_stagefile .stage/source_net
-	fi
-done
+# Remove old source
+if [ -f source-net.tar.gz ]
+then
+	rm -f source-net.tar.gz
+fi
+
+# Create tarball
+tar cfz source-net.tar.gz source
+
+# Creating stage file
+Create_stagefile .stage/source_net

Modified: dists/trunk/live-helper/helpers/lh_source_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb-hdd	2007-05-29 06:48:55 UTC (rev 1862)
+++ dists/trunk/live-helper/helpers/lh_source_usb-hdd	2007-05-29 07:59:09 UTC (rev 1863)
@@ -22,8 +22,6 @@
 
 Arguments "${@}"
 
-Echo_message "Begin building source usb-hdd image..."
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -37,75 +35,76 @@
 	exit 0
 fi
 
-for IMAGE in ${LIVE_SOURCE_IMAGES}
-do
-	if [ "${IMAGE}" = "usb-hdd" ]
-	then
-		# Requiring stage file
-		Require_stagefile .stage/source_debian
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs usb-hdd
+then
+        exit 0
+fi
 
-		# Checking stage file
-		Check_stagefile .stage/source_usb-hdd
+Echo_message "Begin building source usb-hdd image..."
 
-		# Checking lock file
-		Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_debian
 
-		# Creating lock file
-		Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_usb-hdd
 
-		# Checking depends
-		Check_package chroot/sbin/mkdosfs dosfstools
-		Check_package chroot/sbin/parted parted
+# Checking lock file
+Check_lockfile .lock
 
-		# Installing depends
-		Install_package
+# Creating lock file
+Create_lockfile .lock
 
-		# Remove old source
-		if [ -f source.img ]
-		then
-			rm -f source.img
-		fi
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/sbin/parted parted
 
-		# Everything which comes here needs to be cleaned up,
-		DU_DIM="`du -ms source | cut -f1`"
-		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
-		dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
-		FREELO="`${LH_LOSETUP} -f`"
-		if [ ! -b chroot/${FREELO} ]
-		then
-			MAKEDEV="true"
+# Installing depends
+Install_package
 
-			mv chroot/dev chroot/dev.tmp
-			find /dev | cpio -dmpu chroot
-		fi
+# Remove old source
+if [ -f source.img ]
+then
+	rm -f source.img
+fi
 
-		echo "!!! The following error/warning messages can be ignored !!!"
-		lh_losetup $FREELO source.img 0
-		Chroot "parted -s ${FREELO} mklabel msdos" || true
-		Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
-		Chroot "parted -s ${FREELO} set 1 lba off" || true
-		${LH_LOSETUP} -d ${FREELO}
+# Everything which comes here needs to be cleaned up,
+DU_DIM="`du -ms source | cut -f1`"
+REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
+dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
+FREELO="`${LH_LOSETUP} -f`"
+if [ ! -b chroot/${FREELO} ]
+then
+	MAKEDEV="true"
 
-		lh_losetup $FREELO source.img 1
-		Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
-		mkdir -p source.tmp
-		${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
-		cp -r source/* source.tmp
-		${LH_ROOT_COMMAND} umount source.tmp
-		rmdir source.tmp
-		${LH_LOSETUP} -d ${FREELO}
-		echo "!!! The above error/warning messages can be ignored !!!"
+	mv chroot/dev chroot/dev.tmp
+	find /dev | cpio -dmpu chroot
+fi
 
-		if [ -n "${MAKEDEV}" ]
-		then
-			rm -f chroot/dev
-			mv chroot/dev.tmp chroot/dev
-		fi
+echo "!!! The following error/warning messages can be ignored !!!"
+lh_losetup $FREELO source.img 0
+Chroot "parted -s ${FREELO} mklabel msdos" || true
+Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+Chroot "parted -s ${FREELO} set 1 lba off" || true
+${LH_LOSETUP} -d ${FREELO}
 
-		# Removing depends
-		Remove_package
+lh_losetup $FREELO source.img 1
+Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+mkdir -p source.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
+cp -r source/* source.tmp
+${LH_ROOT_COMMAND} umount source.tmp
+rmdir source.tmp
+${LH_LOSETUP} -d ${FREELO}
+echo "!!! The above error/warning messages can be ignored !!!"
 
-		# Creating stage file
-		Create_stagefile .stage/source_usb-hdd
-	fi
-done
+if [ -n "${MAKEDEV}" ]
+then
+	rm -f chroot/dev
+	mv chroot/dev.tmp chroot/dev
+fi
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_usb-hdd

More information about the Debian-live-changes mailing list