fix stuff for the new limine version

theverygaming · Sep 30, 2024 · 14e7518 · 14e7518
1 parent 79fb4af
commit 14e7518
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 44 deletions.
diff --git a/boot/createimg-aarch64.sh b/boot/createimg-aarch64.sh
@@ -30,7 +30,7 @@ mkfs.fat image_extracted.img
 
 mmd -i image_extracted.img ::boot
 
-mcopy -i image_extracted.img rootfs-aarch64/boot/limine.cfg ::boot/
+mcopy -i image_extracted.img rootfs-aarch64/boot/limine.conf ::boot/
 mcopy -i image_extracted.img ../kernel/kernel.o ::boot/kernel.o
 mcopy -i image_extracted.img ../roramfs.fs ::boot/initramfs.bin
 

diff --git a/boot/createimg-x86_32.sh b/boot/createimg-x86_32.sh
@@ -39,7 +39,7 @@ else
     e2cp ${limine_path}/limine.sys -G 0 -O 0 image_extracted.img:/boot/
 fi
 
-e2cp rootfs-x86_32/boot/limine.cfg -G 0 -O 0 image_extracted.img:/boot/
+e2cp rootfs-x86_32/boot/limine.conf -G 0 -O 0 image_extracted.img:/boot/
 e2cp ../kernel_shitshell.bin -G 0 -O 0 image_extracted.img:/boot/kernel.bin
 e2cp ../roramfs.fs -G 0 -O 0 image_extracted.img:/boot/initramfs.bin
 
@@ -76,7 +76,7 @@ else
     mcopy -i image_extracted.img ${limine_path}/limine.sys ::boot/
 fi
 
-mcopy -i image_extracted.img rootfs-x86_32/boot/limine.cfg ::boot/
+mcopy -i image_extracted.img rootfs-x86_32/boot/limine.conf ::boot/
 mcopy -i image_extracted.img ../kernel_shitshell.bin ::boot/kernel.bin
 mcopy -i image_extracted.img ../roramfs.fs ::boot/initramfs.bin
 

diff --git a/boot/createimg-x86_64.sh b/boot/createimg-x86_64.sh
@@ -31,7 +31,7 @@ mkfs.fat image_extracted.img
 mmd -i image_extracted.img ::boot
 
 mcopy -i image_extracted.img ${LIMINE_PATH}/limine-bios.sys ::boot/
-mcopy -i image_extracted.img rootfs-x86_64/boot/limine.cfg ::boot/
+mcopy -i image_extracted.img rootfs-x86_64/boot/limine.conf ::boot/
 mcopy -i image_extracted.img ../kernel/kernel.o ::boot/kernel.o
 mcopy -i image_extracted.img ../roramfs.fs ::boot/initramfs.bin
 

diff --git a/boot/rootfs-aarch64/boot/limine.cfg b/boot/rootfs-aarch64/boot/limine.cfg
diff --git a/boot/rootfs-aarch64/boot/limine.conf b/boot/rootfs-aarch64/boot/limine.conf
@@ -0,0 +1,8 @@
+default_entry: 1
+timeout: 3
+verbose: yes
+
+/vix
+    protocol: limine
+    kernel_path: boot():/boot/kernel.o
+    module_path: boot():/boot/initramfs.bin
diff --git a/boot/rootfs-x86_32/boot/limine.cfg b/boot/rootfs-x86_32/boot/limine.cfg
diff --git a/boot/rootfs-x86_32/boot/limine.conf b/boot/rootfs-x86_32/boot/limine.conf
@@ -0,0 +1,8 @@
+default_entry: 1
+timeout: 3
+verbose: yes
+
+/vix
+    protocol: multiboot2
+    kernel_path: boot():/boot/kernel.bin
+    module_path: boot():/boot/initramfs.bin
diff --git a/boot/rootfs-x86_64/boot/limine.cfg b/boot/rootfs-x86_64/boot/limine.cfg
diff --git a/boot/rootfs-x86_64/boot/limine.conf b/boot/rootfs-x86_64/boot/limine.conf
@@ -0,0 +1,8 @@
+default_entry: 1
+timeout: 3
+verbose: yes
+
+/vix
+    protocol: limine
+    kernel_path: boot():/boot/kernel.o
+    module_path: boot():/boot/initramfs.bin
diff --git a/nix-shells/common.nix b/nix-shells/common.nix
@@ -31,7 +31,7 @@
   ];
 
   limine = with pkgs; [
-    limine
+    (limine.override { enableAll = true; })
   ];
 
   shellHook = ''