From 2ada3fbb5d9ffc4a4b20acd8fe36930aab6db4c0 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Mon, 6 May 2024 14:15:01 +0200
Subject: MHR-23: Update CD-ROM root.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Private/NewBoot/Source/CDROM/EFI/STARTUP.NSH  |  2 --
 Private/NewBoot/Source/CDROM/SplashScreen.fmt |  7 -------
 Private/NewBoot/Source/Root/EFI/STARTUP.NSH   |  2 ++
 Private/NewBoot/Source/Root/SplashScreen.fmt  |  7 +++++++
 Private/NewBoot/Source/makefile               | 10 +++++-----
 5 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 Private/NewBoot/Source/CDROM/EFI/STARTUP.NSH
 delete mode 100644 Private/NewBoot/Source/CDROM/SplashScreen.fmt
 create mode 100644 Private/NewBoot/Source/Root/EFI/STARTUP.NSH
 create mode 100644 Private/NewBoot/Source/Root/SplashScreen.fmt

diff --git a/Private/NewBoot/Source/CDROM/EFI/STARTUP.NSH b/Private/NewBoot/Source/CDROM/EFI/STARTUP.NSH
deleted file mode 100644
index d29ba8fd..00000000
--- a/Private/NewBoot/Source/CDROM/EFI/STARTUP.NSH
+++ /dev/null
@@ -1,2 +0,0 @@
-fs0:
-BOOT\BOOTX64.EFI
diff --git a/Private/NewBoot/Source/CDROM/SplashScreen.fmt b/Private/NewBoot/Source/CDROM/SplashScreen.fmt
deleted file mode 100644
index 6ac6486e..00000000
--- a/Private/NewBoot/Source/CDROM/SplashScreen.fmt
+++ /dev/null
@@ -1,7 +0,0 @@
-==================================================================
-Welcome to NeWS.
-Brought to you by: Amlal EL Mahrouss.
-* NewBoot, NewKernel: Amlal EL Mahrouss.
-This copy can boot directly to NewKernel (Unified System).
-Copyright Mahrouss-Logic, all rights reserved.
-==================================================================
diff --git a/Private/NewBoot/Source/Root/EFI/STARTUP.NSH b/Private/NewBoot/Source/Root/EFI/STARTUP.NSH
new file mode 100644
index 00000000..d29ba8fd
--- /dev/null
+++ b/Private/NewBoot/Source/Root/EFI/STARTUP.NSH
@@ -0,0 +1,2 @@
+fs0:
+BOOT\BOOTX64.EFI
diff --git a/Private/NewBoot/Source/Root/SplashScreen.fmt b/Private/NewBoot/Source/Root/SplashScreen.fmt
new file mode 100644
index 00000000..6ac6486e
--- /dev/null
+++ b/Private/NewBoot/Source/Root/SplashScreen.fmt
@@ -0,0 +1,7 @@
+==================================================================
+Welcome to NeWS.
+Brought to you by: Amlal EL Mahrouss.
+* NewBoot, NewKernel: Amlal EL Mahrouss.
+This copy can boot directly to NewKernel (Unified System).
+Copyright Mahrouss-Logic, all rights reserved.
+==================================================================
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index a04531da..13c4885d 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -29,7 +29,7 @@ EMU_FLAGS=-net none -smp 4 -m 8G -M q35 \
 			-bios OVMF.fd -device piix3-ide,id=ide \
 			-drive id=disk,file=$(IMG),format=raw,if=none \
 			-device ide-hd,drive=disk,bus=ide.0 -drive \
-			file=fat:rw:CDROM,index=2,format=raw -d int -hdd epm-slave.img
+			file=fat:rw:Root,index=2,format=raw -d int -hdd epm-slave.img
 
 LD_FLAGS=-e Main --subsystem=10
 
@@ -58,11 +58,11 @@ invalid-recipe:
 
 .PHONY: all
 all: compile-amd64
-	mkdir -p CDROM/EFI/BOOT
+	mkdir -p Root/EFI/BOOT
 	$(LD_GNU) $(OBJ) $(LD_FLAGS) -o $(BOOT_LOADER)
-	$(COPY) $(BOOT_LOADER) CDROM/EFI/BOOT/BOOTX64.EFI
-	$(COPY) $(BOOT_LOADER) CDROM/EFI/BOOT/NEWBOOT.EFI
-	$(COPY) ../../$(KERNEL) CDROM/$(KERNEL)
+	$(COPY) $(BOOT_LOADER) Root/EFI/BOOT/BOOTX64.EFI
+	$(COPY) $(BOOT_LOADER) Root/EFI/BOOT/NEWBOOT.EFI
+	$(COPY) ../../$(KERNEL) Root/$(KERNEL)
 
 ifneq ($(DEBUG_SUPPORT), )
 DEBUG =  -D__DEBUG__
-- 
cgit v1.2.3