From ebf1983b6fe64279849b1f1f6fe635eeefc5dcf9 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 6 Sep 2022 15:50:07 -0600
Subject: [PATCH] Build ISO using HD emulation

---
 .gitmodules |  4 ----
 isolinux    |  1 -
 mk/disk.mk  | 16 ++++++++--------
 3 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 160000 isolinux

diff --git a/.gitmodules b/.gitmodules
index 679984e..80f8f8c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = installer
 	url = https://gitlab.redox-os.org/redox-os/installer.git
 	branch = master
-[submodule "isolinux"]
-	path = isolinux
-	url = https://gitlab.redox-os.org/redox-os/isolinux.git
-	branch = master
 [submodule "rust"]
 	path = rust
 	url = https://gitlab.redox-os.org/redox-os/rust.git
diff --git a/isolinux b/isolinux
deleted file mode 160000
index 3cf79d3..0000000
--- a/isolinux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3cf79d335400af8fc3a87a13f0ae12777a766b3b
diff --git a/mk/disk.mk b/mk/disk.mk
index e138319..3eb68f7 100644
--- a/mk/disk.mk
+++ b/mk/disk.mk
@@ -14,15 +14,15 @@ build/livedisk.bin: $(FILESYSTEM_CONFIG)
 	$(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial
 	mv $@.partial $@
 
-build/livedisk.iso: build/livedisk.bin.gz
-	rm -rf build/iso/
+build/livedisk.iso: build/livedisk.bin
+	rm -rf build/iso/ $@.partial
 	mkdir -p build/iso/
-	cp -RL isolinux build/iso/
-	cp $< build/iso/livedisk.gz
-	genisoimage -o $@ -b isolinux/isolinux.bin -c isolinux/boot.cat \
-					-no-emul-boot -boot-load-size 4 -boot-info-table \
-					build/iso/
-	isohybrid $@
+	cp -v $< build/iso/livedisk.bin
+	genisoimage -o $@.partial \
+		-hard-disk-boot \
+		-b livedisk.bin \
+		build/iso/
+	mv $@.partial $@
 
 mount: FORCE
 	mkdir -p build/filesystem/