Merge branch 'next' of github.com:dyne/libdevuansdk into next

zlibs/bootstrap

@@ -116,7 +116,7 @@ bootstrap_tar_pack() {
 	local _dest=$(dirname $bootstrap_tgz)
 
 	if [[ -f $bootstrap_tgz ]]; then
-		act "tarball found already in $_dest"
+		notice "tarball found already in $_dest"
 	else
 		notice "Creating boostrap tarball in $bootstrap_tgz"
 		silly
@@ -138,16 +138,17 @@ bootstrap_tar_unpack() {
 	ckreq || return 1
 
 	if [[ -f "${unpath}/.keep" ]]; then
+		act "skipping tarball unpack"
+	else
+		sudo rm -rf ${unpath}
 		mkdir -p ${unpath}
 		silly
 		sudo tar xfp $bootstrap_tgz -C ${unpath}
 		sudo mkdir -p ${unpath}/{boot,dev,sys,proc}
-	else
-		error "no .keep file found. exiting..."
-		zerr
-		exit 1
 	fi
 
+	conf_print_sourceslist | sudo tee $strapdir/etc/apt/sources.list >/dev/null
+
 	cat <<EOF | sudo tee ${strapdir}/postunpack >/dev/null
 #!/bin/sh
 apt-get update

zlibs/iso

@@ -88,10 +88,13 @@ iso_squash_strap() {
 
 	notice "creating squashfs out of strapdir"
 
+	[[ -n "$mkefi" ]] && uefi_opt="-Xbcj x86"
 	pushd $workdir
 	sudo mksquashfs $strapdir binary/live/filesystem.squashfs \
+		${=uefi_opt} \
 		-noappend -comp xz || zerr
 	popd
+	unset uefi_opt
 }
 
 iso_xorriso_build() {
@@ -102,6 +105,10 @@ iso_xorriso_build() {
 	notice "building iso..."
 	isoname="${image_name}-live.iso"
 
+	[[ -n "$mkefi" ]] && {
+	uefi_opt="-eltorito-alt-boot -e boot/grub/efiboot.img -isohybrid-gpt-basdat -no-emul-boot"
+	}
+
 	mkdir -p $R/dist
 	pushd $workdir
 	sudo xorriso -as mkisofs -r -J -joliet-long -l \
@@ -113,9 +120,11 @@ iso_xorriso_build() {
 		-no-emul-boot \
 		-boot-load-size 4 \
 		-boot-info-table \
+		${=uefi_opt} \
 		-o $R/dist/$isoname \
 		binary || zerr
 	popd
+	unset uefi_opt
 }
 
 iso_setup_installer() {