Adding live-helper 1.0~a9-1.

12 files changed, 96 insertions, 87 deletions

diff --git a/helpers/lh_binary b/helpers/lh_binary
index c3575cd16..038a19a4a 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -26,40 +26,40 @@ Echo_debug "Init ${PROGRAM}"
 Breakpoint "binary: Init"
 
 # Preparing root filesystem
-lh_binary_chroot "${@}"
+lh_binary_chroot ${*}
 
 # Configuring chroot
-lh_chroot_proc install "${@}"
-lh_chroot_sysfs install "${@}"
-lh_chroot_hosts install "${@}"
-lh_chroot_resolv install "${@}"
-lh_chroot_sources install "${@}"
+lh_chroot_proc install ${*}
+lh_chroot_sysfs install ${*}
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_sources install ${*}
 
 # Building root filesystem
-lh_binary_rootfs "${@}"
-lh_binary_manifest "${@}"
-lh_binary_encryption "${@}"
+lh_binary_rootfs ${*}
+lh_binary_manifest ${*}
+lh_binary_encryption ${*}
 
 # Prepare images
-lh_binary_linuximage "${@}"
-lh_binary_debian-installer "${@}"
-lh_binary_memtest "${@}"
-lh_binary_grub "${@}"
-lh_binary_syslinux "${@}"
-lh_binary_yaboot "${@}"
-lh_binary_includes "${@}"
-lh_binary_localincludes "${@}"
-lh_binary_md5sum "${@}"
+lh_binary_linuximage ${*}
+lh_binary_debian-installer ${*}
+lh_binary_memtest ${*}
+lh_binary_grub ${*}
+lh_binary_syslinux ${*}
+lh_binary_yaboot ${*}
+lh_binary_includes ${*}
+lh_binary_localincludes ${*}
+lh_binary_md5sum ${*}
 
 # Building images
-lh_binary_hdd "${@}"
-lh_binary_iso "${@}"
-lh_binary_net "${@}"
-lh_binary_usb-hdd "${@}"
+lh_binary_hdd ${*}
+lh_binary_iso ${*}
+lh_binary_net ${*}
+lh_binary_usb-hdd ${*}
 
 # Deconfiguring chroot
 rm -f .stage/chroot_sources
-lh_chroot_resolv remove "${@}"
-lh_chroot_hosts remove "${@}"
-lh_chroot_sysfs remove "${@}"
-lh_chroot_proc remove "${@}"
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
+lh_chroot_sysfs remove ${*}
+lh_chroot_proc remove ${*}
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 6d6d7847c..b5927a090 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -109,6 +109,8 @@ then
 	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
 fi
 
+FIXME ()
+{
 # 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}"
@@ -234,6 +236,7 @@ EOF
 
 apt-ftparchive generate cache/indices_debian-installer/archive
 apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+}
 
 mkdir binary/.disk
 echo "main" > binary/.disk/base_components
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 15d898d41..4a1bc9331 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -83,7 +83,7 @@ then
 	# Working arround vfat limitations
 	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
 	then
-		CP_OPTIONS="--preserve=link,mode,timestamps"
+		CP_OPTIONS="-L"
 	fi
 
 	# Copying d-i templates
@@ -112,8 +112,8 @@ then
 		DEBIAN_TOOLS_TXT="/tools/"
 	fi
 
-	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
-	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
+	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
+	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
 fi
 
 # Creating stage file
diff --git a/helpers/lh_binary_localincludes b/helpers/lh_binary_localincludes
index 2c1f7524c..66504c1d2 100755
--- a/helpers/lh_binary_localincludes
+++ b/helpers/lh_binary_localincludes
@@ -53,6 +53,12 @@ then
 	find . | cpio -dmpu "${OLDPWD}"/binary
 	cd "${OLDPWD}"
 
+	# Removing symlinks
+	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+	then
+		find binary -type l | xargs rm -f
+	fi
+
 	# Creating stage file
 	Create_stagefile .stage/binary_localincludes
 fi
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 8a8f144cf..e643966cf 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -77,7 +77,7 @@ do
 
 		# Everything which comes here needs to be cleaned up,
 		DU_DIM="`du -ms binary | cut -f1`"
-		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
+		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} ]
diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap
index 733fad344..36a7a0a10 100755
--- a/helpers/lh_bootstrap
+++ b/helpers/lh_bootstrap
@@ -38,5 +38,5 @@ Read_conffile config/source
 Set_defaults
 
 # Bootstrapping system
-lh_bootstrap_cdebootstrap "${@}"
-lh_bootstrap_debootstrap "${@}"
+lh_bootstrap_cdebootstrap ${*}
+lh_bootstrap_debootstrap ${*}
diff --git a/helpers/lh_build b/helpers/lh_build
index 20ae36d0d..e2cef4c11 100755
--- a/helpers/lh_build
+++ b/helpers/lh_build
@@ -26,13 +26,13 @@ Echo_debug "Init ${PROGRAM}"
 Breakpoint "build: Init"
 
 # Bootstrapping system
-lh_bootstrap "${@}"
+lh_bootstrap ${*}
 
 # Customizing chroot
-lh_chroot "${@}"
+lh_chroot ${*}
 
 # Building binary image
-lh_binary "${@}"
+lh_binary ${*}
 
 # Building source image
-lh_source "${@}"
+lh_source ${*}
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index ed40c33b0..451a6b463 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -35,38 +35,38 @@ Set_defaults
 Breakpoint "chroot: Init"
 
 # Configuring chroot
-lh_chroot_proc install "${@}"
-lh_chroot_sysfs install "${@}"
-lh_chroot_debianchroot install "${@}"
-lh_chroot_sysvrc install "${@}"
-lh_chroot_hosts install "${@}"
-lh_chroot_resolv install "${@}"
-lh_chroot_apt install "${@}"
-lh_chroot_sources install "${@}"
-lh_chroot_linuximage install "${@}"
+lh_chroot_proc install ${*}
+lh_chroot_sysfs install ${*}
+lh_chroot_debianchroot install ${*}
+lh_chroot_sysvrc install ${*}
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_apt install ${*}
+lh_chroot_sources install ${*}
+lh_chroot_linuximage install ${*}
 
 # Customizing chroot
-lh_chroot_tasks "${@}"
-lh_chroot_packageslists "${@}"
-lh_chroot_packages "${@}"
-lh_chroot_localpackages "${@}"
-lh_chroot_localpackageslists "${@}"
-lh_chroot_localization "${@}"
-lh_chroot_localincludes "${@}"
-lh_chroot_sysvinit "${@}"
-lh_chroot_hooks "${@}"
-lh_chroot_localhooks "${@}"
-lh_chroot_symlinks "${@}"
-lh_chroot_hacks "${@}"
-lh_chroot_interactive "${@}"
+lh_chroot_tasks ${*}
+lh_chroot_packageslists ${*}
+lh_chroot_packages ${*}
+lh_chroot_localpackages ${*}
+lh_chroot_localpackageslists ${*}
+lh_chroot_localization ${*}
+lh_chroot_localincludes ${*}
+lh_chroot_sysvinit ${*}
+lh_chroot_hooks ${*}
+lh_chroot_localhooks ${*}
+lh_chroot_symlinks ${*}
+lh_chroot_hacks ${*}
+lh_chroot_interactive ${*}
 
 # Deconfiguring chroot
-lh_chroot_linuximage remove "${@}"
-lh_chroot_sources remove "${@}"
-lh_chroot_apt remove "${@}"
-lh_chroot_resolv remove "${@}"
-lh_chroot_hosts remove "${@}"
-lh_chroot_sysvrc remove "${@}"
-lh_chroot_debianchroot remove "${@}"
-lh_chroot_sysfs remove "${@}"
-lh_chroot_proc remove "${@}"
+lh_chroot_linuximage remove ${*}
+lh_chroot_sources remove ${*}
+lh_chroot_apt remove ${*}
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
+lh_chroot_sysvrc remove ${*}
+lh_chroot_debianchroot remove ${*}
+lh_chroot_sysfs remove ${*}
+lh_chroot_proc remove ${*}
diff --git a/helpers/lh_config b/helpers/lh_config
index 3b4f940bf..8e9e11754 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -158,23 +158,23 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}"
 
 # \$LH_BREAKPOINTS: enable breakpoints
 # (Default: ${LH_BREAKPOINTS})
-LH_BREAKPOINTS="${LH_BREAKPOINTS}"
+#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
 
 # \$LH_DEBUG: enable debug
 # (Default: ${LH_DEBUG})
-LH_DEBUG="${LH_DEBUG}"
+#LH_DEBUG="${LH_DEBUG}"
 
 # \$LH_FORCE: enable force
 # (Default: ${LH_FORCE})
-LH_FORCE="${LH_FORCE}"
+#LH_FORCE="${LH_FORCE}"
 
 # \$LH_QUIET: enable quiet
 # (Default: ${LH_QUIET})
-LH_QUIET="${LH_QUIET}"
+#LH_QUIET="${LH_QUIET}"
 
 # \$LH_VERBOSE: enable verbose
 # (Default: ${LH_VERBOSE})
-LH_VERBOSE="${LH_VERBOSE}"
+#LH_VERBOSE="${LH_VERBOSE}"
 EOF
 
 # Creating lh_chroot_* configuration
diff --git a/helpers/lh_source b/helpers/lh_source
index a595569f4..ff5df201f 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -35,23 +35,23 @@ Set_defaults
 Breakpoint "source: Init"
 
 # Enabling network in chroot
-lh_chroot_hosts install "${@}"
-lh_chroot_resolv install "${@}"
-lh_chroot_sources install "${@}"
+lh_chroot_hosts install ${*}
+lh_chroot_resolv install ${*}
+lh_chroot_sources install ${*}
 
 # Preparing images
-lh_source_config "${@}"
-lh_source_download "${@}"
-lh_source_md5sum "${@}"
+lh_source_config ${*}
+lh_source_download ${*}
+lh_source_md5sum ${*}
 
 # Building images
-lh_source_generic "${@}"
-lh_source_hdd "${@}"
-lh_source_iso "${@}"
-lh_source_net "${@}"
-lh_source_usb-hdd "${@}"
+lh_source_generic ${*}
+lh_source_hdd ${*}
+lh_source_iso ${*}
+lh_source_net ${*}
+lh_source_usb-hdd ${*}
 
 # Deconfiguring chroot
 rm -f .stage/chroot_sources
-lh_chroot_resolv remove "${@}"
-lh_chroot_hosts remove "${@}"
+lh_chroot_resolv remove ${*}
+lh_chroot_hosts remove ${*}
diff --git a/helpers/lh_source_download b/helpers/lh_source_download
index 050dc4dbe..cdae2c979 100755
--- a/helpers/lh_source_download
+++ b/helpers/lh_source_download
@@ -60,7 +60,7 @@ fi
 # Download sources
 Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
 echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
-echo "live-helper" >> chroot/root/dpkg-selection.txt
+#echo "live-helper" >> chroot/root/dpkg-selection.txt
 Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
 rm -f chroot/root/dpkg-selection.txt
 
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 7cc7c2376..4eca22a79 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -70,7 +70,7 @@ do
 
 		# Everything which comes here needs to be cleaned up,
 		DU_DIM="`du -ms source | cut -f1`"
-		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
+		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} ]