diff --git a/build/xtask/src/main.rs b/build/xtask/src/main.rs index 792face0..d56bbb5f 100644 --- a/build/xtask/src/main.rs +++ b/build/xtask/src/main.rs @@ -99,7 +99,7 @@ fn build(sh: &Shell, rl: bool, mut args: Arguments) -> Result<()> { cmd!( sh, "git clone https://github.com/limine-bootloader/limine.git - --branch=v6.x-branch-binary + --branch=v8.x-binary --depth=1" ) .run()?; @@ -142,7 +142,7 @@ fn build(sh: &Shell, rl: bool, mut args: Arguments) -> Result<()> { let dir = dir.create_dir("BOOT")?; copy_to_image(&dir, "./xernel/kernel/limine/BOOTX64.EFI", "BOOTX64.EFI")?; - copy_to_image(&dir, "./xernel/kernel/limine.cfg", "limine.cfg")?; + copy_to_image(&dir, "./xernel/kernel/limine.conf", "limine.conf")?; } fs.unmount()?; diff --git a/xernel/kernel/limine.cfg b/xernel/kernel/limine.cfg deleted file mode 100644 index aa6f85b6..00000000 --- a/xernel/kernel/limine.cfg +++ /dev/null @@ -1,19 +0,0 @@ - -# Timeout in seconds that Limine will use before automatically booting. -TIMEOUT=0 - -# The entry name that will be displayed in the boot menu -:xernel - -# Change the protocol line depending on the used protocol. -PROTOCOL=limine - -# Path to the kernel to boot. boot:/// represents the partition on which limine.cfg is located. -KERNEL_PATH=boot:///xernel - -# NOTE: we abuse the MODULE_CMDLINE variable to pass a name of the module -MODULE_PATH=boot:///logo.bmp -MODULE_CMDLINE="logo" - -#MODULE_PATH=boot:///xernel -#MODULE_CMDLINE="xernel" \ No newline at end of file diff --git a/xernel/kernel/limine.conf b/xernel/kernel/limine.conf new file mode 100644 index 00000000..878926a6 --- /dev/null +++ b/xernel/kernel/limine.conf @@ -0,0 +1,17 @@ + +# Timeout in seconds that Limine will use before automatically booting. +timeout: 0 + +# The entry name that will be displayed in the boot menu +/xernel + + # Change the protocol line depending on the used protocol. + protocol: limine + + kernel_path: boot():/xernel + + module_path: boot():/logo.bmp + module_cmdline: "logo" + + #MODULE_PATH=boot:///xernel + #MODULE_CMDLINE="xernel"