Adding upstream version 4.0~alpha35.

functions/cache.sh

@@ -14,7 +14,7 @@ Restore_cache ()
 
 	if [ "${LB_CACHE}" = "true" ] && [ "${LB_CACHE_PACKAGES}" = "true" ]
 	then
-		if [ -d "${DIRECTORY}" ]
+		if [ -e "${DIRECTORY}" ]
 		then
 			# Restore old cache
 			if [ "$(stat --printf %d ${DIRECTORY})" = "$(stat --printf %d chroot/var/cache/apt/archives)" ]

functions/defaults.sh

@@ -135,7 +135,7 @@ Set_defaults ()
 			;;
 
 		*)
-			LB_DISTRIBUTION="${LB_DISTRIBUTION:-wheezy}"
+			LB_DISTRIBUTION="${LB_DISTRIBUTION:-jessie}"
 			LB_DERIVATIVE="false"
 			;;
 	esac
@@ -1061,12 +1061,12 @@ Check_defaults ()
 
 	if [ "${LB_BOOTLOADER}" = "syslinux" ]
 	then
-		# syslinux + fat
+		# syslinux + fat or ntfs, or extlinux + ext[234] or btrfs
 		case "${LB_BINARY_FILESYSTEM}" in
-			fat*|ntfs)
+			fat*|ntfs|ext[234]|btrfs)
 				;;
 			*)
-				Echo_warning "You have selected values of LB_BOOTLOADER and LB_BINARY_FILESYSTEM which are incompatible - syslinux only supports FAT and NTFS filesystems."
+				Echo_warning "You have selected values of LB_BOOTLOADER and LB_BINARY_FILESYSTEM which are incompatible - the syslinux family only support FAT, NTFS, ext[234] or btrfs filesystems."
 				;;
 		esac
 	fi

scripts/build/binary_hdd

@@ -77,7 +77,19 @@ case "${LB_BOOTLOADER}" in
 		;;
 
 	syslinux)
-		Check_package chroot/usr/bin/syslinux syslinux
+		case ${LB_BINARY_FILESYSTEM} in
+			fat*|ntfs)
+				_BOOTLOADER=syslinux
+				;;
+			ext[234]|btrfs)
+				_BOOTLOADER=extlinux
+				;;
+			*)
+				Echo_error "syslinux/extlinux doesn't support ${LB_BINARY_FILESYSTEM}"
+				exit 1
+				;;
+		esac
+		Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
 		;;
 esac
 
@@ -179,7 +191,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
 
 		if [ "${LB_BOOTLOADER}" = "syslinux" ]
 		then
-			dd if=chroot/usr/lib/syslinux/mbr.bin of=${FREELO} bs=440 count=1
+			dd if=chroot/usr/lib/${_BOOTLOADER}/mbr.bin of=${FREELO} bs=440 count=1
 		fi
 		;;
 
@@ -191,7 +203,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
 
 		if [ "${LB_BOOTLOADER}" = "syslinux" ]
 		then
-			dd if=/usr/lib/syslinux/mbr.bin of=${FREELO} bs=440 count=1
+			dd if=/usr/lib/${_BOOTLOADER}/mbr.bin of=${FREELO} bs=440 count=1
 		fi
 		;;
 esac
@@ -247,6 +259,8 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 esac
 
+Echo_message "Copying binary contents into image..."
+
 mkdir -p chroot/binary.tmp
 mount ${MOUNT_OPTIONS} ${FREELO} chroot/binary.tmp
 cp -T ${CP_OPTIONS} binary/ chroot/binary.tmp
@@ -282,22 +296,33 @@ EOF
 fi
 }
 
-umount chroot/binary.tmp
-rmdir chroot/binary.tmp
+case "${_BOOTLOADER}" in
+	syslinux)
+		_SYSLINUX_INSTALLER="syslinux ${FREELO}"
+		;;
+	extlinux)
+		_SYSLINUX_INSTALLER="extlinux --install /binary.tmp/boot/extlinux"
+		;;
+	*)
+		_SYSLINUX_INSTALLER=""
+		;;
+esac
 
-if [ "${LB_BOOTLOADER}" = "syslinux" ]
+if [ -n "${_SYSLINUX_INSTALLER}" ]
 then
 	case "${LB_BUILD_WITH_CHROOT}" in
 		true)
-			Chroot chroot "syslinux ${FREELO}"
+			Chroot chroot "${_SYSLINUX_INSTALLER}"
 			;;
-
 		false)
-			syslinux ${FREELO}
+			${_SYSLINUX_INSTALLER}
 			;;
 	esac
 fi
 
+umount chroot/binary.tmp
+rmdir chroot/binary.tmp
+
 Lodetach ${FREELO}
 
 echo "!!! The above error/warning messages can be ignored !!!"

scripts/build/binary_syslinux

@@ -79,15 +79,28 @@ case "${LIVE_IMAGE_TYPE}" in
 		;;
 
 	hdd*|*)
-		_BOOTLOADER="syslinux"
-
-		case "${LB_MODE}" in
-			progress-linux)
-				_TARGET="binary/boot"
+		case ${LB_BINARY_FILESYSTEM} in
+			fat*|ntfs)
+				_BOOTLOADER=syslinux
+
+				case "${LB_MODE}" in
+					progress-linux)
+						_TARGET="binary/boot"
+						;;
+
+					*)
+						_TARGET="binary/syslinux"
+						;;
+				esac
 				;;
 
+			ext[234]|btrfs)
+				_BOOTLOADER=extlinux
+				_TARGET="binary/boot/extlinux"
+				;;
 			*)
-				_TARGET="binary/syslinux"
+				Echo_error "syslinux/extlinux doesn't support ${LB_BINARY_FILESYSTEM}"
+				exit 1
 				;;
 		esac
 		;;
@@ -110,7 +123,7 @@ fi
 # Checking depends
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
-		Check_package chroot/usr/bin/syslinux syslinux
+		Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
 		Check_package chroot/usr/lib/syslinux syslinux-common
 
 		if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
@@ -120,10 +133,10 @@ case "${LB_BUILD_WITH_CHROOT}" in
 		;;
 
 	false)
-		if [ ! -e /usr/bin/syslinux ]
+		if [ ! -e /usr/bin/${_BOOTLOADER} ]
 		then
-			# syslinux
-			Echo_error "/usr/bin/syslinux - no such file."
+			# syslinux or extlinux
+			Echo_error "/usr/bin/${_BOOTLOADER} - no such file."
 			exit 1
 		fi
 

scripts/build/build

@@ -17,6 +17,7 @@ set -e
 if [ -x auto/config ] && [ ! -e .build/config ]
 then
 	Echo_message "Automatically populating config tree."
+	lb init
 	lb config
 fi
 

scripts/build/chroot_hacks

@@ -117,6 +117,8 @@ case "${LB_INITRAMFS}" in
 		;;
 esac
 
+rm -f chroot/etc/hosts
+
 if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
 then
 	# This is a temporary hack to get rid of fstab;