From cc56423e35a499d1037b49b9d18c836cc4f3cab8 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Wed, 19 Oct 2016 13:06:57 +0200
Subject: [PATCH] switch to vesamenu; add installer

---
 config        |  3 +++
 zlibs/helpers |  1 +
 zlibs/iso     | 26 +++++++++++++++++---------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/config b/config
index 0a1bbe1..40dc557 100644
--- a/config
+++ b/config
@@ -60,6 +60,9 @@ base_packages=(
 	wireless-tools
 	elinks
 	firmware-linux-free
+	btrfs-tools
+	zsh
+	rsync
 )
 
 purge_packages=(
diff --git a/zlibs/helpers b/zlibs/helpers
index 622cc06..337de24 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -55,6 +55,7 @@ build_iso_dist() {
 	build_kernel_${arch}    || zerr
 	iso_setup_isolinux      || zerr
 	iso_write_isolinux_cfg  || zerr
+	[[ $INSTALLER = 1 ]] && iso_setup_installer
 	iso_squash_strap        || zerr
 	iso_xorriso_build       || zerr
 }
diff --git a/zlibs/iso b/zlibs/iso
index ceb7992..ed3efb4 100644
--- a/zlibs/iso
+++ b/zlibs/iso
@@ -19,6 +19,8 @@
 
 ## burn baby
 
+[[ $INSTALLER = 1 ]] && base_packages+=(grub-pc)
+
 iso_prepare_strap() {
 	fn iso_prepare_strap
 	req=(strapdir)
@@ -53,13 +55,10 @@ iso_setup_isolinux() {
 	sudo cp $CPVERBOSE $strapdir/boot/vmlinuz* binary/live/vmlinuz
 	sudo cp $CPVERBOSE $strapdir/boot/initrd*  binary/live/initrd
 
-	## TODO: check if others are worth adding
-	sudo cp $CPVERBOSE /usr/lib/ISOLINUX/isolinux.bin             binary/isolinux/
-	sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/elf.c32     binary/isolinux/
-	sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/ldlinux.c32 binary/isolinux/
-	sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/libutil.c32 binary/isolinux/
-	sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/linux.c32   binary/isolinux/
-	sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/menu.c32    binary/isolinux/
+	sudo cp $CPVERBOSE /usr/share/live/build/bootloaders/isolinux/isolinux.bin \
+		binary/isolinux
+	sudo cp $CPVERBOSE /usr/share/live/build/bootloaders/isolinux/*.c32 \
+		binary/isolinux
 	popd
 }
 
@@ -70,7 +69,7 @@ iso_write_isolinux_cfg() {
 
 	notice "writing isolinux configuration"
 	cat <<EOF | sudo tee ${workdir}/binary/isolinux/isolinux.cfg
-ui menu.c32
+ui vesamenu.c32
 prompt 0
 menu title ${os} boot menu
 timeout 300
@@ -79,7 +78,7 @@ label live-${arch}
 menu label ^${os} Live (${arch})
 menu default
 linux /live/vmlinuz
-append initrd=live/initrd boot=live
+append initrd=/live/initrd boot=live
 
 endtext
 EOF
@@ -119,3 +118,12 @@ iso_xorriso_build() {
 		binary
 	popd
 }
+
+iso_setup_installer() {
+	fn iso_setup_installer
+
+	notice "setting up devuan-installer"
+	sudo cp $CPVERBOSE $R/extra/installer/* $strapdir/
+
+	## TODO: init to script
+}