Moving off binary image type into new config tree format.

15 files changed, 28 insertions, 29 deletions

diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index b7665d781..e0f3a3723 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -74,7 +74,7 @@ Restore_cache cache/packages.binary
 Install_package
 
 # Setting destination directory
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	netboot)
 		DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}"
 		;;
@@ -94,7 +94,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		DI_IMAGE_TYPE="netboot"
 		;;
 	*)
-		case "${LB_BINARY_IMAGES}" in
+		case "${LIVE_IMAGE_TYPE}" in
 			netboot)
 				DI_IMAGE_TYPE="netboot"
 				;;
@@ -769,7 +769,7 @@ EOF
 		DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}"
 	fi
 
-	case "${LB_BINARY_IMAGES}" in
+	case "${LIVE_IMAGE_TYPE}" in
 		hdd)
 			case "${LB_BINARY_FILESYSTEM}" in
 				fat*|ntfs)
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index 8b7a43c3f..ea9d605d3 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|hdd*)
 		;;
 	*)
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index cef3da768..9fa1ba1c5 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -132,7 +132,7 @@ case "${LB_INITRAMFS}" in
 esac
 
 # Setting destination directory
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|tar)
 		case "${LB_INITRAMFS}" in
 			casper)
@@ -245,7 +245,7 @@ fi
 mkdir -p binary/boot/grub
 cp -r "${TEMPLATES}"/* binary/boot/grub
 
-case ${LB_BINARY_IMAGES} in
+case ${LIVE_IMAGE_TYPE} in
 	iso*)
 		FILES="chroot/usr/lib/grub/*/stage2_eltorito"
 		;;
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index 1b77523d1..7182a5e4d 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -106,7 +106,7 @@ case "${LB_INITRAMFS}" in
 esac
 
 # Setting destination directory
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|tar)
 		case "${LB_INITRAMFS}" in
 			casper)
@@ -218,7 +218,7 @@ fi
 mkdir -p binary/boot/grub
 cp -r "${TEMPLATES}"/* binary/boot/grub
 
-case ${LB_BINARY_IMAGES} in
+case ${LIVE_IMAGE_TYPE} in
 	iso*)
 		FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
 		;;
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index efa0d9909..4df21dc2f 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if ! In_list hdd "${LB_BINARY_IMAGES}"
+if ! In_list hdd "${LIVE_IMAGE_TYPE}"
 then
 	exit 0
 fi
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes
index f1f345a95..8e1b0c225 100755
--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@@ -46,7 +46,7 @@ then
 	cd "${OLDPWD}"
 
 	# Removing symlinks
-	case "${LB_BINARY_IMAGES}" in
+	case "${LIVE_IMAGE_TYPE}" in
 		hdd*)
 			find binary -type l | xargs rm -f
 			;;
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index 7802f046e..15638b288 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso)
 		IMAGE="binary.iso"
 		;;
@@ -55,7 +55,7 @@ Create_lockfile .lock
 # Checking depends
 Check_package chroot/usr/bin/xorriso xorriso
 
-if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
+if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
 then
 	Check_package chroot/usr/lib/syslinux/isohdpfx.bin syslinux-common
 fi
@@ -76,7 +76,7 @@ fi
 XORRISO_OPTIONS="-as mkisofs -r -J -joliet-long -l -cache-inodes"
 
 # Handle xorriso live-build specific options
-if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
+if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
 then
 	XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin -partition_offset 16"
 fi
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot
index 08cc9d308..d6cf2e266 100755
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if ! In_list netboot "${LB_BINARY_IMAGES}"
+if ! In_list netboot "${LIVE_IMAGE_TYPE}"
 then
 	exit 0
 fi
diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo
index 8e833d1cc..0560555a1 100755
--- a/scripts/build/binary_silo
+++ b/scripts/build/binary_silo
@@ -30,7 +30,7 @@ then
 fi
 
 # Check image type
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|hdd*|tar)
 		;;
 
@@ -191,7 +191,7 @@ fi
 
 LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
 
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|hdd*)
 		# Copying silo
 		mkdir -p binary/boot
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 7f1bf86f7..12f59e089 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -48,7 +48,7 @@ Check_architectures amd64 i386
 Check_crossarchitectures
 
 # Assembling image specifics
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*)
 		_BOOTLOADER="isolinux"
 
diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar
index 9b9b3dec0..870abec89 100755
--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if ! In_list tar "${LB_BINARY_IMAGES}"
+if ! In_list tar "${LIVE_IMAGE_TYPE}"
 then
 	exit 0
 fi
diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot
index 8fc5a64dd..1a1c9df4a 100755
--- a/scripts/build/binary_yaboot
+++ b/scripts/build/binary_yaboot
@@ -139,7 +139,7 @@ case "${LB_INITRAMFS}" in
 esac
 
 # Setting destination directory
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*)
 		case "${LB_INITRAMFS}" in
 			casper)
@@ -241,7 +241,7 @@ fi
 
 LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
 
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|hdd*)
 		# Copying yaboot
 		mkdir -p binary/yaboot
@@ -258,7 +258,7 @@ case "${LB_BINARY_IMAGES}" in
 
 		cp -r "${TEMPLATES}"/* binary/yaboot
 
-		case "${LB_BINARY_IMAGES}" in
+		case "${LIVE_IMAGE_TYPE}" in
 			hdd*)
 				mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp
 				echo "root=/dev/ram" > binary/yaboot/yaboot.conf
diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync
index f43fe8a43..fa761638c 100755
--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_BINARY_IMAGES}" != "iso" ] && [ "${LB_BINARY_IMAGES}" != "iso-hybrid" ]
+if [ "${LIVE_IMAGE_TYPE}" != "iso" ] && [ "${LIVE_IMAGE_TYPE}" != "iso-hybrid" ]
 then
 	exit 0
 fi
@@ -57,7 +57,7 @@ Restore_cache cache/packages.binary
 # Installing depends
 Install_package
 
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso)
 		_IMAGES="binary.iso"
 		;;
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index a30f83054..4e615c82a 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -38,7 +38,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	netboot)
 		if [ ! -f chroot/sbin/mount.cifs ]
 		then
diff --git a/scripts/build/config b/scripts/build/config
index e5562db46..17106e487 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -562,7 +562,7 @@ Local_arguments ()
 				;;
 
 			-b|--binary-images)
-				LB_BINARY_IMAGES="${2}"
+				LIVE_IMAGE_TYPE="${2}"
 				shift 2
 				;;
 
@@ -1302,10 +1302,6 @@ cat > config/binary << EOF
 # (Default: ${LB_BINARY_FILESYSTEM})
 LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM}"
 
-# \$LB_BINARY_IMAGES: set image type
-# (Default: ${LB_BINARY_IMAGES})
-LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
-
 # \$LB_APT_INDICES: set apt/aptitude generic indices
 # (Default: ${LB_APT_INDICES})
 LB_APT_INDICES="${LB_APT_INDICES}"
@@ -1491,6 +1487,9 @@ fi
 
 # New style configuration
 Set_configuration "config/control" "Configuration-Version" "${LIVE_CONFIGURATION_VERSION}"
+echo "" >> config/control
+Set_configuration "config/control" "Image" "binary"
+Set_configuration "config/control" "Type" "${LIVE_IMAGE_TYPE}"
 
 # Creating stage file
 Create_stagefile .build/config