Updating internal calls to use live-build instead of live-helper.

cgi/cron

@@ -97,9 +97,9 @@ then
 
 		# Generating image
 		cd "${_TEMPDIR}"/"${_BUILD}"
-		lh config -c ${_FILE} >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
+		lb config -c ${_FILE} >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
 		_ERRORCONFIG="${?}"
-		lh build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
+		lb build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
 		_ERRORBUILD="${?}"
 
 		_DATE_END="`date -R`"

functions/defaults.sh

@@ -498,7 +498,7 @@ Set_defaults ()
 		case "${LH_ARCHITECTURE}" in
 			arm|armel)
 				Echo_error "There is no default kernel flavour defined for your architecture."
-				Echo_error "Please configure it manually with 'lh config -k FLAVOUR'."
+				Echo_error "Please configure it manually with 'lb config -k FLAVOUR'."
 				exit 1
 				;;
 

scripts/build/binary

@@ -28,74 +28,74 @@ Set_defaults
 Setup_cleanup
 
 # Preparing root filesystem
-lh binary_chroot ${*}
+lb binary_chroot ${*}
 
 if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	# Configuring chroot
-	lh chroot_devpts install ${*}
-	lh chroot_proc install ${*}
-	lh chroot_selinuxfs install ${*}
-	lh chroot_sysfs install ${*}
-	lh chroot_hosts install ${*}
-	lh chroot_resolv install ${*}
-	lh chroot_hostname install ${*}
-	lh chroot_sysv-rc install ${*}
-	lh chroot_upstart install ${*}
-	lh chroot_apt install-binary ${*}
-	lh chroot_sources install ${*}
+	lb chroot_devpts install ${*}
+	lb chroot_proc install ${*}
+	lb chroot_selinuxfs install ${*}
+	lb chroot_sysfs install ${*}
+	lb chroot_hosts install ${*}
+	lb chroot_resolv install ${*}
+	lb chroot_hostname install ${*}
+	lb chroot_sysv-rc install ${*}
+	lb chroot_upstart install ${*}
+	lb chroot_apt install-binary ${*}
+	lb chroot_sources install ${*}
 fi
 
 # Building root filesystem
-lh binary_rootfs ${*}
-lh binary_manifest ${*}
-lh binary_encryption ${*}
+lb binary_rootfs ${*}
+lb binary_manifest ${*}
+lb binary_encryption ${*}
 
 # Prepare images
-lh binary_local-packageslists ${*}
-lh binary_linux-image ${*}
-lh binary_debian-installer ${*}
-lh binary_memtest ${*}
-lh binary_grub ${*}
-lh binary_grub2 ${*}
-lh binary_syslinux ${*}
-lh binary_yaboot ${*}
-lh binary_silo ${*}
-lh binary_disk ${*}
-lh binary_win32-loader ${*}
-lh binary_includes ${*}
-lh binary_local-includes ${*}
-lh binary_local-hooks ${*}
-lh binary_checksums ${*}
+lb binary_local-packageslists ${*}
+lb binary_linux-image ${*}
+lb binary_debian-installer ${*}
+lb binary_memtest ${*}
+lb binary_grub ${*}
+lb binary_grub2 ${*}
+lb binary_syslinux ${*}
+lb binary_yaboot ${*}
+lb binary_silo ${*}
+lb binary_disk ${*}
+lb binary_win32-loader ${*}
+lb binary_includes ${*}
+lb binary_local-includes ${*}
+lb binary_local-hooks ${*}
+lb binary_checksums ${*}
 
 if [ "${LH_BUILD_WITH_CHROOT}" != "true" ]
 then
-	lh chroot_devpts install ${*}
-	lh chroot_proc install ${*}
-	lh chroot_selinuxfs install ${*}
-	lh chroot_sysfs install ${*}
+	lb chroot_devpts install ${*}
+	lb chroot_proc install ${*}
+	lb chroot_selinuxfs install ${*}
+	lb chroot_sysfs install ${*}
 fi
 
 # Building images
-lh binary_iso ${*}
-lh binary_net ${*}
-lh binary_tar ${*}
-lh binary_usb ${*}
-lh binary_virtual-hdd ${*}
+lb binary_iso ${*}
+lb binary_net ${*}
+lb binary_tar ${*}
+lb binary_usb ${*}
+lb binary_virtual-hdd ${*}
 
 if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	# Deconfiguring chroot
 	rm -f .stage/chroot_sources
-	lh chroot_hostname remove ${*}
-	lh chroot_resolv remove ${*}
-	lh chroot_hosts remove ${*}
+	lb chroot_hostname remove ${*}
+	lb chroot_resolv remove ${*}
+	lb chroot_hosts remove ${*}
 fi
 
-lh chroot_apt remove ${*}
-lh chroot_sysv-rc remove ${*}
-lh chroot_sysfs remove ${*}
-lh chroot_upstart remove ${*}
-lh chroot_selinuxfs remove ${*}
-lh chroot_proc remove ${*}
-lh chroot_devpts remove ${*}
+lb chroot_apt remove ${*}
+lb chroot_sysv-rc remove ${*}
+lb chroot_sysfs remove ${*}
+lb chroot_upstart remove ${*}
+lb chroot_selinuxfs remove ${*}
+lb chroot_proc remove ${*}
+lb chroot_devpts remove ${*}

scripts/build/binary_rootfs

@@ -123,38 +123,38 @@ case "${LH_CHROOT_FILESYSTEM}" in
 					rm -f .lock
 					mv chroot/chroot chroot.tmp
 
-					lh chroot_linux-image remove ${*}
-					lh chroot_sources remove ${*}
-					lh chroot_apt remove ${*}
-					lh chroot_hostname remove ${*}
-					lh chroot_resolv remove ${*}
-					lh chroot_hosts remove ${*}
-					lh chroot_sysv-rc remove ${*}
-					lh chroot_upstart remove ${*}
-					lh chroot_dpkg remove ${*}
-					lh chroot_debianchroot remove ${*}
-					lh chroot_sysfs remove ${*}
-					lh chroot_selinuxfs remove ${*}
-					lh chroot_proc remove ${*}
-					lh chroot_devpts remove ${*}
+					lb chroot_linux-image remove ${*}
+					lb chroot_sources remove ${*}
+					lb chroot_apt remove ${*}
+					lb chroot_hostname remove ${*}
+					lb chroot_resolv remove ${*}
+					lb chroot_hosts remove ${*}
+					lb chroot_sysv-rc remove ${*}
+					lb chroot_upstart remove ${*}
+					lb chroot_dpkg remove ${*}
+					lb chroot_debianchroot remove ${*}
+					lb chroot_sysfs remove ${*}
+					lb chroot_selinuxfs remove ${*}
+					lb chroot_proc remove ${*}
+					lb chroot_devpts remove ${*}
 
 					rm -rf chroot
 					mv chroot.tmp chroot
 
-					lh chroot_devpts install ${*}
-					lh chroot_proc install ${*}
-					lh chroot_selinuxfs install ${*}
-					lh chroot_sysfs install ${*}
-					lh chroot_debianchroot install ${*}
-					lh chroot_dpkg install ${*}
-					lh chroot_sysv-rc install ${*}
-					lh chroot_upstart install ${*}
-					lh chroot_hosts install ${*}
-					lh chroot_resolv install ${*}
-					lh chroot_hostname install ${*}
-					lh chroot_apt install ${*}
-					lh chroot_sources install ${*}
-					lh chroot_linux-image install ${*}
+					lb chroot_devpts install ${*}
+					lb chroot_proc install ${*}
+					lb chroot_selinuxfs install ${*}
+					lb chroot_sysfs install ${*}
+					lb chroot_debianchroot install ${*}
+					lb chroot_dpkg install ${*}
+					lb chroot_sysv-rc install ${*}
+					lb chroot_upstart install ${*}
+					lb chroot_hosts install ${*}
+					lb chroot_resolv install ${*}
+					lb chroot_hostname install ${*}
+					lb chroot_apt install ${*}
+					lb chroot_sources install ${*}
+					lb chroot_linux-image install ${*}
 
 					touch .lock
 				else
@@ -207,38 +207,38 @@ case "${LH_CHROOT_FILESYSTEM}" in
 					rm -f .lock
 					mv chroot/chroot chroot.tmp
 
-					lh chroot_linux-image remove ${*}
-					lh chroot_sources remove ${*}
-					lh chroot_apt remove ${*}
-					lh chroot_hostname remove ${*}
-					lh chroot_resolv remove ${*}
-					lh chroot_hosts remove ${*}
-					lh chroot_sysv-rc remove ${*}
-					lh chroot_upstart remove ${*}
-					lh chroot_dpkg remove ${*}
-					lh chroot_debianchroot remove ${*}
-					lh chroot_sysfs remove ${*}
-					lh chroot_selinuxfs remove ${*}
-					lh chroot_proc remove ${*}
-					lh chroot_devpts remove ${*}
+					lb chroot_linux-image remove ${*}
+					lb chroot_sources remove ${*}
+					lb chroot_apt remove ${*}
+					lb chroot_hostname remove ${*}
+					lb chroot_resolv remove ${*}
+					lb chroot_hosts remove ${*}
+					lb chroot_sysv-rc remove ${*}
+					lb chroot_upstart remove ${*}
+					lb chroot_dpkg remove ${*}
+					lb chroot_debianchroot remove ${*}
+					lb chroot_sysfs remove ${*}
+					lb chroot_selinuxfs remove ${*}
+					lb chroot_proc remove ${*}
+					lb chroot_devpts remove ${*}
 
 					rm -rf chroot
 					mv chroot.tmp chroot
 
-					lh chroot_devpts install ${*}
-					lh chroot_proc install ${*}
-					lh chroot_selinuxfs install ${*}
-					lh chroot_sysfs install ${*}
-					lh chroot_debianchroot install ${*}
-					lh chroot_dpkg install ${*}
-					lh chroot_sysv-rc install ${*}
-					lh chroot_upstart install ${*}
-					lh chroot_hosts install ${*}
-					lh chroot_resolv install ${*}
-					lh chroot_hostname install ${*}
-					lh chroot_apt install ${*}
-					lh chroot_sources install ${*}
-					lh chroot_linux-image install ${*}
+					lb chroot_devpts install ${*}
+					lb chroot_proc install ${*}
+					lb chroot_selinuxfs install ${*}
+					lb chroot_sysfs install ${*}
+					lb chroot_debianchroot install ${*}
+					lb chroot_dpkg install ${*}
+					lb chroot_sysv-rc install ${*}
+					lb chroot_upstart install ${*}
+					lb chroot_hosts install ${*}
+					lb chroot_resolv install ${*}
+					lb chroot_hostname install ${*}
+					lb chroot_apt install ${*}
+					lb chroot_sources install ${*}
+					lb chroot_linux-image install ${*}
 
 					touch .lock
 				else
@@ -330,38 +330,38 @@ case "${LH_CHROOT_FILESYSTEM}" in
 					rm -f .lock
 					mv chroot/chroot chroot.tmp
 
-					lh chroot_linux-image remove ${*}
-					lh chroot_sources remove ${*}
-					lh chroot_apt remove ${*}
-					lh chroot_hostname remove ${*}
-					lh chroot_resolv remove ${*}
-					lh chroot_hosts remove ${*}
-					lh chroot_sysv-rc remove ${*}
-					lh chroot_upstart remove ${*}
-					lh chroot_dpkg remove ${*}
-					lh chroot_debianchroot remove ${*}
-					lh chroot_sysfs remove ${*}
-					lh chroot_selinuxfs remove ${*}
-					lh chroot_proc remove ${*}
-					lh chroot_devpts remove ${*}
+					lb chroot_linux-image remove ${*}
+					lb chroot_sources remove ${*}
+					lb chroot_apt remove ${*}
+					lb chroot_hostname remove ${*}
+					lb chroot_resolv remove ${*}
+					lb chroot_hosts remove ${*}
+					lb chroot_sysv-rc remove ${*}
+					lb chroot_upstart remove ${*}
+					lb chroot_dpkg remove ${*}
+					lb chroot_debianchroot remove ${*}
+					lb chroot_sysfs remove ${*}
+					lb chroot_selinuxfs remove ${*}
+					lb chroot_proc remove ${*}
+					lb chroot_devpts remove ${*}
 
 					rm -rf chroot
 					mv chroot.tmp chroot
 
-					lh chroot_devpts install ${*}
-					lh chroot_proc install ${*}
-					lh chroot_selinuxfs install ${*}
-					lh chroot_sysfs install ${*}
-					lh chroot_debianchroot install ${*}
-					lh chroot_dpkg install ${*}
-					lh chroot_sysv-rc install ${*}
-					lh chroot_upstart install ${*}
-					lh chroot_hosts install ${*}
-					lh chroot_resolv install ${*}
-					lh chroot_hostname install ${*}
-					lh chroot_apt install ${*}
-					lh chroot_sources install ${*}
-					lh chroot_linux-image install ${*}
+					lb chroot_devpts install ${*}
+					lb chroot_proc install ${*}
+					lb chroot_selinuxfs install ${*}
+					lb chroot_sysfs install ${*}
+					lb chroot_debianchroot install ${*}
+					lb chroot_dpkg install ${*}
+					lb chroot_sysv-rc install ${*}
+					lb chroot_upstart install ${*}
+					lb chroot_hosts install ${*}
+					lb chroot_resolv install ${*}
+					lb chroot_hostname install ${*}
+					lb chroot_apt install ${*}
+					lb chroot_sources install ${*}
+					lb chroot_linux-image install ${*}
 
 					touch .lock
 				else

scripts/build/bootstrap

@@ -28,8 +28,8 @@ Set_defaults
 Setup_cleanup
 
 # Bootstrapping system
-lh bootstrap_cache restore ${*}
-lh bootstrap_copy ${*}
-lh bootstrap_cdebootstrap ${*}
-lh bootstrap_debootstrap ${*}
-lh bootstrap_cache save ${*}
+lb bootstrap_cache restore ${*}
+lb bootstrap_copy ${*}
+lb bootstrap_cdebootstrap ${*}
+lb bootstrap_debootstrap ${*}
+lb bootstrap_cache save ${*}

scripts/build/bootstrap_cdebootstrap

@@ -37,7 +37,7 @@ Echo_message "Begin bootstrapping system..."
 Check_package /usr/bin/${LH_BOOTSTRAP} cdebootstrap
 
 # Ensure that a system is built as root
-lh testroot
+lb testroot
 
 # Checking stage file
 Check_stagefile .stage/bootstrap

scripts/build/bootstrap_copy

@@ -35,7 +35,7 @@ Check_crossarchitecture
 Echo_message "Begin bootstrapping system..."
 
 # Ensure that a system is built as root
-lh testroot
+lb testroot
 
 # Checking stage file
 Check_stagefile .stage/bootstrap

scripts/build/bootstrap_debootstrap

@@ -37,7 +37,7 @@ Echo_message "Begin bootstrapping system..."
 Check_package /usr/sbin/debootstrap debootstrap
 
 # Ensure that a system is built as root
-lh testroot
+lb testroot
 
 # Checking stage file
 Check_stagefile .stage/bootstrap

scripts/build/build

@@ -17,7 +17,7 @@ set -e
 if [ -x auto/config ] && [ ! -e .stage/config ]
 then
 	Echo_message "Automatically populating config tree."
-	lh config
+	lb config
 fi
 
 # Read meta config
@@ -64,13 +64,13 @@ Set_defaults
 Check_defaults
 
 # Bootstrapping system
-lh bootstrap ${*}
+lb bootstrap ${*}
 
 # Customizing chroot
-lh chroot ${*}
+lb chroot ${*}
 
 # Building binary images
-lh binary ${*}
+lb binary ${*}
 
 # Building source images
-lh source ${*}
+lb source ${*}

scripts/build/chroot

@@ -28,56 +28,56 @@ Set_defaults
 Setup_cleanup
 
 # Configuring chroot
-lh chroot_cache restore ${*}
-lh chroot_devpts install ${*}
-lh chroot_proc install ${*}
-lh chroot_selinuxfs install ${*}
-lh chroot_sysfs install ${*}
-lh chroot_debianchroot install ${*}
-lh chroot_dpkg install ${*}
-lh chroot_dpkg_tmpfs install ${*}
-lh chroot_sysv-rc install ${*}
-lh chroot_upstart install ${*}
-lh chroot_hosts install ${*}
-lh chroot_resolv install ${*}
-lh chroot_hostname install ${*}
-lh chroot_apt install ${*}
-lh chroot_sources install ${*}
-lh chroot_linux-image install ${*}
+lb chroot_cache restore ${*}
+lb chroot_devpts install ${*}
+lb chroot_proc install ${*}
+lb chroot_selinuxfs install ${*}
+lb chroot_sysfs install ${*}
+lb chroot_debianchroot install ${*}
+lb chroot_dpkg install ${*}
+lb chroot_dpkg_tmpfs install ${*}
+lb chroot_sysv-rc install ${*}
+lb chroot_upstart install ${*}
+lb chroot_hosts install ${*}
+lb chroot_resolv install ${*}
+lb chroot_hostname install ${*}
+lb chroot_apt install ${*}
+lb chroot_sources install ${*}
+lb chroot_linux-image install ${*}
 
 # Customizing chroot
-lh chroot_preseed ${*}
-lh chroot_local-preseed ${*}
-lh chroot_tasks ${*}
-lh chroot_packageslists ${*}
-lh chroot_local-packageslists ${*}
-lh chroot_packages ${*}
-lh chroot_local-packages ${*}
-lh chroot_install-packages ${*}
-lh chroot_localization ${*}
-lh chroot_local-includes ${*}
-lh chroot_local-patches ${*}
-lh chroot_sysvinit ${*}
-lh chroot_local-hooks ${*}
-lh chroot_hooks ${*}
-lh chroot_symlinks ${*}
-lh chroot_hacks ${*}
-lh chroot_interactive ${*}
+lb chroot_preseed ${*}
+lb chroot_local-preseed ${*}
+lb chroot_tasks ${*}
+lb chroot_packageslists ${*}
+lb chroot_local-packageslists ${*}
+lb chroot_packages ${*}
+lb chroot_local-packages ${*}
+lb chroot_install-packages ${*}
+lb chroot_localization ${*}
+lb chroot_local-includes ${*}
+lb chroot_local-patches ${*}
+lb chroot_sysvinit ${*}
+lb chroot_local-hooks ${*}
+lb chroot_hooks ${*}
+lb chroot_symlinks ${*}
+lb chroot_hacks ${*}
+lb chroot_interactive ${*}
 
 # Deconfiguring chroot
-lh chroot_linux-image remove ${*}
-lh chroot_sources remove ${*}
-lh chroot_apt remove ${*}
-lh chroot_hostname remove ${*}
-lh chroot_resolv remove ${*}
-lh chroot_hosts remove ${*}
-lh chroot_sysv-rc remove ${*}
-lh chroot_upstart remove ${*}
-lh chroot_dpkg_tmpfs remove ${*}
-lh chroot_dpkg remove ${*}
-lh chroot_debianchroot remove ${*}
-lh chroot_sysfs remove ${*}
-lh chroot_selinuxfs remove ${*}
-lh chroot_proc remove ${*}
-lh chroot_devpts remove ${*}
-lh chroot_cache save ${*}
+lb chroot_linux-image remove ${*}
+lb chroot_sources remove ${*}
+lb chroot_apt remove ${*}
+lb chroot_hostname remove ${*}
+lb chroot_resolv remove ${*}
+lb chroot_hosts remove ${*}
+lb chroot_sysv-rc remove ${*}
+lb chroot_upstart remove ${*}
+lb chroot_dpkg_tmpfs remove ${*}
+lb chroot_dpkg remove ${*}
+lb chroot_debianchroot remove ${*}
+lb chroot_sysfs remove ${*}
+lb chroot_selinuxfs remove ${*}
+lb chroot_proc remove ${*}
+lb chroot_devpts remove ${*}
+lb chroot_cache save ${*}

scripts/build/chroot_devpts

@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Ensure that a system is built as root
-lh testroot
+lb testroot
 
 # Reading configuration files
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source

scripts/build/chroot_proc

@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Ensure that a system is built as root
-lh testroot
+lb testroot
 
 # Reading configuration files
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source

scripts/build/chroot_selinuxfs

@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Ensure that a system is built as root
-lh testroot
+lb testroot
 
 # Reading configuration files
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source

scripts/build/chroot_sysfs

@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Ensure that a system is built as root
-lh testroot
+lb testroot
 
 # Reading configuration files
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source

scripts/build/local

@@ -15,5 +15,5 @@ export LH_BASE PATH
 
 if [ ! -z "${1}" ]
 then
-	exec lh "${@}"
+	exec lb "${@}"
 fi

scripts/build/source

@@ -30,26 +30,26 @@ Require_stagefile .stage/chroot_install-packages
 Setup_cleanup
 
 # Enabling network in chroot
-lh chroot_hosts install ${*}
-lh chroot_resolv install ${*}
-lh chroot_hostname install ${*}
-lh chroot_sources install ${*}
+lb chroot_hosts install ${*}
+lb chroot_resolv install ${*}
+lb chroot_hostname install ${*}
+lb chroot_sources install ${*}
 
 # Preparing images
-lh source_debian-live ${*}
-lh source_debian ${*}
-lh source_disk ${*}
-lh source_checksums ${*}
+lb source_debian-live ${*}
+lb source_debian ${*}
+lb source_disk ${*}
+lb source_checksums ${*}
 
 # Building images
-lh source_iso ${*}
-lh source_net ${*}
-lh source_tar ${*}
-lh source_usb ${*}
-lh source_virtual-hdd ${*}
+lb source_iso ${*}
+lb source_net ${*}
+lb source_tar ${*}
+lb source_usb ${*}
+lb source_virtual-hdd ${*}
 
 # Deconfiguring chroot
 rm -f .stage/chroot_sources
-lh chroot_hostname remove ${*}
-lh chroot_resolv remove ${*}
-lh chroot_hosts remove ${*}
+lb chroot_hostname remove ${*}
+lb chroot_resolv remove ${*}
+lb chroot_hosts remove ${*}