From 3ba84f05c26b8b3f6ac1da3eeff8489bdccc7890 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sun, 22 May 2016 21:53:37 +0200
Subject: [PATCH] /sys/lib/dist/mkfile: efi iso/hybrid support

---
 sys/lib/dist/mkfile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/sys/lib/dist/mkfile b/sys/lib/dist/mkfile
index db0e57024..9a2560ff0 100644
--- a/sys/lib/dist/mkfile
+++ b/sys/lib/dist/mkfile
@@ -15,17 +15,26 @@ binds:V:
 	@{rfork n
 	mk binds
 	disk/mk9660 -c9j -B 386/9bootiso -E 386/efiboot.fat -p $proto -s /n/src9 -v 'Plan 9 Front' $target
-	if(bind -q /n/src9/386/9boothyb /n/src9/386/9bootfat){
-		dd -if /dev/zero -bs 512 -count 4096 >> $target
+	if(test -r /n/src9/386/9boothyb){
+		dd -if /dev/zero -bs 2048 -count 1024 >> $target
 		disk/partfs -m /n/partfs $target
 		disk=/n/partfs/sdXX
 		disk/mbr -m /n/src9/386/mbr $disk/data
 		@{echo a p1 '$-1' '$'
-			echo t p1 FAT16
+			echo t p1 ESP
 			echo A p1
 			echo w
 			echo q} | disk/fdisk -b $disk/data
-		disk/format -b /n/src9/386/pbs -d -r 1 $disk/dos /n/src9/386/9bootfat
+		disk/format -b /n/src9/386/pbs -xd -t hard $disk/esp
+		s = esp.$pid
+		dossrv -f $disk/esp $s
+		mount -c /srv/$s /n/esp
+		cp /n/src9/386/9boothyb /n/esp/9bootfat
+		mkdir /n/esp/efi
+		mkdir /n/esp/efi/boot
+		cp /n/src9/386/boot*.efi /n/esp/efi/boot
+		unmount /n/esp
+		rm -f /srv/$s
 	}}
 
 %.zynq.img: