Renaming --chroot-build to --build-with-chroot.

16 files changed, 38 insertions, 38 deletions

diff --git a/helpers/binary b/helpers/binary
index 9b15189..11a1781 100755
--- a/helpers/binary
+++ b/helpers/binary
@@ -29,7 +29,7 @@ Setup_cleanup
 # Preparing root filesystem
 lh binary_chroot ${*}
 
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	# Configuring chroot
 	lh chroot_devpts install ${*}
@@ -67,7 +67,7 @@ lh binary_local-includes ${*}
 lh binary_local-hooks ${*}
 lh binary_checksums ${*}
 
-if [ "${LH_CHROOT_BUILD}" != "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" != "true" ]
 then
 	lh chroot_devpts install ${*}
 	lh chroot_proc install ${*}
@@ -82,7 +82,7 @@ lh binary_tar ${*}
 lh binary_usb ${*}
 lh binary_virtual-hdd ${*}
 
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	# Deconfiguring chroot
 	rm -f .stage/chroot_sources
diff --git a/helpers/binary_chroot b/helpers/binary_chroot
index c9dc4dc..4b3c249 100755
--- a/helpers/binary_chroot
+++ b/helpers/binary_chroot
@@ -67,7 +67,7 @@ then
 	find /dev | cpio -dmpu chroot
 fi
 
-if [ "${LH_CHROOT_BUILD}" = "false" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
 then
 	exit 0
 fi
diff --git a/helpers/binary_encryption b/helpers/binary_encryption
index 1808fd3..db32227 100755
--- a/helpers/binary_encryption
+++ b/helpers/binary_encryption
@@ -85,7 +85,7 @@ Install_package
 
 Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LH_CHROOT_FILESYSTEM}" "${LH_ENCRYPTION}"
 
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	# Moving image
 	mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} chroot
@@ -100,7 +100,7 @@ do
 	Echo " (Passwords must be at least 20 characters long)"
 	echo
 
-	case "${LH_CHROOT_BUILD}" in
+	case "${LH_BUILD_WITH_CHROOT}" in
 		true)
 			if Chroot chroot aespipe -e ${LH_ENCRYPTION} -T \
 				< chroot/filesystem.${LH_CHROOT_FILESYSTEM} \
diff --git a/helpers/binary_grub b/helpers/binary_grub
index b4d21d1..40a3443 100755
--- a/helpers/binary_grub
+++ b/helpers/binary_grub
@@ -285,7 +285,7 @@ case ${LH_BINARY_IMAGES} in
 		;;
 esac
 
-if [ "${LH_CHROOT_BUILD}" = "false" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
 then
 	FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
 fi
diff --git a/helpers/binary_grub2 b/helpers/binary_grub2
index dde12b0..2afae22 100755
--- a/helpers/binary_grub2
+++ b/helpers/binary_grub2
@@ -258,7 +258,7 @@ case ${LH_BINARY_IMAGES} in
 		;;
 esac
 
-if [ "${LH_CHROOT_BUILD}" = "false" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
 then
 	FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
 fi
diff --git a/helpers/binary_iso b/helpers/binary_iso
index a7754b2..47de9d6 100755
--- a/helpers/binary_iso
+++ b/helpers/binary_iso
@@ -199,7 +199,7 @@ EOF
 
 fi
 
-case "${LH_CHROOT_BUILD}" in
+case "${LH_BUILD_WITH_CHROOT}" in
 	true)
 		# Moving image
 		mv binary.sh chroot
diff --git a/helpers/binary_memtest b/helpers/binary_memtest
index 6c59f10..8afcb9f 100755
--- a/helpers/binary_memtest
+++ b/helpers/binary_memtest
@@ -48,7 +48,7 @@ then
 	exit 0
 fi
 
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 
 	if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ]
@@ -94,7 +94,7 @@ Check_multiarchitecture
 mkdir -p "${DESTDIR}"
 
 # Installing memtest
-case "${LH_CHROOT_BUILD}" in
+case "${LH_BUILD_WITH_CHROOT}" in
 	true)
 		cp chroot/boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
 		;;
diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs
index 635adbb..c813d46 100755
--- a/helpers/binary_rootfs
+++ b/helpers/binary_rootfs
@@ -83,7 +83,7 @@ do
 done
 
 # Handling chroot excludes
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	if [ -f config/binary_rootfs/excludes ]
 	then
@@ -135,7 +135,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 
 		RESERVED_PERCENTAGE="--reserved-percentage"
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}"
 
@@ -219,7 +219,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			JFFS2_OPTIONS="--eraseblock=${LH_JFFS2_ERASEBLOCK}"
 		fi
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				Chroot chroot "mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output filesystem.jffs2"
 
@@ -288,7 +288,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			rm -rf binary/${INITFS}/filesystem.dir
 		fi
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				mv chroot/chroot binary/${INITFS}/filesystem.dir
 				;;
@@ -334,7 +334,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			cp config/binary_rootfs/squashfs.sort chroot #FIXME
 		fi
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				# Create image
 				Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
@@ -421,7 +421,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			rm -rf binary
 		fi
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				mv chroot/chroot binary
 				;;
diff --git a/helpers/binary_silo b/helpers/binary_silo
index aca5afe..ab8dd87 100755
--- a/helpers/binary_silo
+++ b/helpers/binary_silo
@@ -229,7 +229,7 @@ case "${LH_BINARY_IMAGES}" in
 		# Copying silo
 		mkdir -p binary/boot
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				cp chroot/boot/second.b binary/boot
 				;;
diff --git a/helpers/binary_syslinux b/helpers/binary_syslinux
index 116eaf4..af7e9cd 100755
--- a/helpers/binary_syslinux
+++ b/helpers/binary_syslinux
@@ -220,7 +220,7 @@ Copy_syslinux_templates ()
 				;;
 		esac
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
 				;;
@@ -582,7 +582,7 @@ Configure_syslinux_templates
 # Configure syslinux setup per boot method
 case "${LH_BINARY_IMAGES}" in
 	iso*)
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
 				;;
@@ -601,7 +601,7 @@ case "${LH_BINARY_IMAGES}" in
 		;;
 
 	net)
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				cp chroot/usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH}
 				;;
@@ -632,7 +632,7 @@ case "${LH_BINARY_IMAGES}" in
 		;;
 
 	usb*|tar)
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin
 				;;
diff --git a/helpers/binary_usb b/helpers/binary_usb
index b2a800f..7d84305 100755
--- a/helpers/binary_usb
+++ b/helpers/binary_usb
@@ -141,7 +141,7 @@ case "${LH_BINARY_FILESYSTEM}" in
 		;;
 esac
 
-case "${LH_CHROOT_BUILD}" in
+case "${LH_BUILD_WITH_CHROOT}" in
 	true)
 		Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true
 		Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
@@ -190,7 +190,7 @@ case "${LH_BINARY_FILESYSTEM}" in
 		;;
 esac
 
-case "${LH_CHROOT_BUILD}" in
+case "${LH_BUILD_WITH_CHROOT}" in
 	true)
 		Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
 		;;
@@ -246,7 +246,7 @@ rmdir chroot/binary.tmp
 
 if [ "${LH_BOOTLOADER}" = "syslinux" ]
 then
-	case "${LH_CHROOT_BUILD}" in
+	case "${LH_BUILD_WITH_CHROOT}" in
 		true)
 			Chroot chroot "syslinux ${FREELO}"
 			;;
diff --git a/helpers/binary_virtual-hdd b/helpers/binary_virtual-hdd
index 8b03910..4e61c6b 100755
--- a/helpers/binary_virtual-hdd
+++ b/helpers/binary_virtual-hdd
@@ -42,7 +42,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	case "${LH_BINARY_FILESYSTEM}" in
 		ext2|ext3)
@@ -66,7 +66,7 @@ fi
 Echo_message "Creating virtual disk image..."
 dd if=/dev/zero of=binary-virtual.img bs=1024k count=0 seek=${LH_VIRTUAL_ROOT_SIZE}
 
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	mv binary-virtual.img chroot
 
diff --git a/helpers/binary_win32-loader b/helpers/binary_win32-loader
index 47859df..759ebac 100755
--- a/helpers/binary_win32-loader
+++ b/helpers/binary_win32-loader
@@ -54,7 +54,7 @@ case "${LH_ARCHITECTURE}" in
 				;;
 		esac
 
-		if [ "${LH_CHROOT_BUILD}" = "true" ]
+		if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 		then
 			# Checking depends
 			Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader
diff --git a/helpers/binary_yaboot b/helpers/binary_yaboot
index 2081391..148424e 100755
--- a/helpers/binary_yaboot
+++ b/helpers/binary_yaboot
@@ -276,7 +276,7 @@ case "${LH_BINARY_IMAGES}" in
 		# Copying yaboot
 		mkdir -p binary/yaboot
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LH_BUILD_WITH_CHROOT}" in
 			true)
 				cp chroot/usr/lib/yaboot/yaboot binary/yaboot
 				;;
diff --git a/helpers/config b/helpers/config
index 63f6ca3..6ca0afd 100755
--- a/helpers/config
+++ b/helpers/config
@@ -53,7 +53,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--cache-packages true|false]\n\
 \t    [--cache-stages STAGE|\"STAGES\"]\n\
 \t    [--checksums md5|sha1|sha256|none]\n\
-\t    [--chroot-build true|false]\n\
+\t    [--build-with-chroot true|false]\n\
 \t    [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
 \t    [-c|--conffile FILE]\n\
 \t    [--clean\n\
@@ -144,7 +144,7 @@ Local_arguments ()
 		mirror-binary-security:,mirror-binary-volatile:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
 		packages:,packages-lists:,tasks:,security:,volatile:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
-		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
+		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
 		iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
@@ -569,8 +569,8 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--chroot-build)
-				LH_CHROOT_BUILD="${2}"
+			--build-with-chroot)
+				LH_BUILD_WITH_CHROOT="${2}"
 				shift 2
 				;;
 
@@ -1162,10 +1162,10 @@ LH_BOOTLOADER="${LH_BOOTLOADER}"
 # (Default: ${LH_CHECKSUMS})
 LH_CHECKSUMS="${LH_CHECKSUMS}"
 
-# \${LH_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: ${LH_CHROOT_BUILD})
+# \${LH_BUILD_WITH_CHROOT: control if we build binary images chrooted
+# (Default: ${LH_BUILD_WITH_CHROOT})
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
-LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
+LH_BUILD_WITH_CHROOT="${LH_BUILD_WITH_CHROOT}"
 
 # \$LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: ${LH_DEBIAN_INSTALLER})
diff --git a/helpers/source_virtual-hdd b/helpers/source_virtual-hdd
index 74f7af5..b67ee3f 100755
--- a/helpers/source_virtual-hdd
+++ b/helpers/source_virtual-hdd
@@ -47,7 +47,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	case "${LH_BINARY_FILESYSTEM}" in
 		ext2|ext3)
@@ -70,7 +70,7 @@ DU_DIM="$(du -ms source | cut -f1)"
 REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
 dd if=/dev/zero of=source-virtual.img bs=1024k count=0 seek=${REAL_DIM}
 
-if [ "${LH_CHROOT_BUILD}" = "true" ]
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
 then
 	mv source-virtual.img chroot