add build_iso_dist() and dpkg diverts to 386/amd64 kernels

zlibs/helpers

@@ -43,6 +43,22 @@ build_image_dist() {
 	image_pack_dist                    || zerr
 }
 
+build_iso_dist() {
+	fn build_iso_dist
+	req=(workdir strapdir os arch)
+	ckreq || return 1
+
+	notice "building complete iso image"
+
+	bootstrap_complete_base || zerr
+	iso_prepare_strap       || zerr
+	build_kernel_${arch}    || zerr
+	iso_setup_isolinux      || zerr
+	iso_write_isolinux_cfg  || zerr
+	iso_squash_strap        || zerr
+	iso_xorriso_build       || zerr
+}
+
 devprocsys() {
 	fn devprocsys "$@"
 	local watdo="$1"

zlibs/iso

@@ -34,8 +34,10 @@ apt-get --yes --force-yes autoremove
 apt-get clean
 rm -f /isoprep
 EOF
+	dpkgdivert on $strapdir
 	sudo chmod +x $strapdir/isoprep
 	sudo -E chroot $strapdir /isoprep
+	dpkgdivert off $strapdir
 }
 
 iso_setup_isolinux() {
@@ -104,10 +106,10 @@ iso_xorriso_build() {
 	isoname="${image_name}-live.iso"
 
 	pushd $workdir
-	sudo xorriso -as mkisofs -r -J -joliet-long -l -cache-inodes \
+	sudo xorriso -as mkisofs -r -J -joliet-long -l \
 		-isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
 		-partition_offset 16 \
-		-a "${os} Live - ${arch}" \
+		-A "${os} Live - ${arch}" \
 		-b isolinux/isolinux.bin \
 		-c isolinux/boot.cat \
 		-no-emul-boot \

zlibs/kernel

@@ -30,12 +30,14 @@ build_kernel_amd64() {
 
 	notice "installing stock kernel for $arch"
 
+	dpkgdivert on $strapdir
 	devprocsys mount $strapdir
 
 	sudo chroot $strapdir \
 		apt-get --yes --force-yes install $kernel
 
 	devprocsys umount $strapdir
+	dpkgdivert off $strapdir
 }
 
 build_kernel_i386() {
@@ -49,10 +51,12 @@ build_kernel_i386() {
 
 	notice "installing stock kernel for $arch"
 
+	dpkgdivert on $strapdir
 	devprocsys mount $strapdir
 
 	sudo chroot $strapdir \
 		apt-get --yes --force-yes install $kernel
 
 	devprocsys umount $strapdir
+	dpkgdivert off $strapdir
 }