From a89feeb492c6089b9ab80a4c120f61f6f474d38f Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 4 Nov 2022 01:25:00 +0200 Subject: [PATCH] Update configs --- Makefile | 1 + tools/grub.cfg | 2 +- tools/limine.cfg | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9671f888..526fbcdb 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ build_kernel: build_userspace: make --quiet -C Userspace build + cp -r Userspace/out/* initrd/ build_drivers: make --quiet -C Drivers build diff --git a/tools/grub.cfg b/tools/grub.cfg index 7dc4418e..0bb5a029 100644 --- a/tools/grub.cfg +++ b/tools/grub.cfg @@ -3,6 +3,6 @@ set timeout=0 # set lang=ro_RO menuentry "Fennix" { - multiboot2 /kernel.fsys --alloc=liballoc11 --cores=0 --tasking=multi --drvdir=/system/drivers --init=/system/init + multiboot2 /kernel.fsys --alloc=liballoc11 --cores=0 --tasking=multi --drvdir=/system/drivers --init=/system/init.fex boot } \ No newline at end of file diff --git a/tools/limine.cfg b/tools/limine.cfg index 1342df6c..b6643fe5 100644 --- a/tools/limine.cfg +++ b/tools/limine.cfg @@ -5,7 +5,7 @@ INTERFACE_BRANDING=Fennix # DO NOT EDIT! COMMENT=Boot Fennix using Limine protocol PROTOCOL=limine - KERNEL_CMDLINE=--alloc=liballoc11 --cores=0 --tasking=multi --drvdir=/system/drivers --init=/system/init + KERNEL_CMDLINE=--alloc=liballoc11 --cores=0 --tasking=multi --drvdir=/system/drivers --init=/system/init.fex KERNEL_PATH=boot:///kernel.fsys MODULE_PATH=boot:///initrd.tar.gz