diff --git a/Makefile b/Makefile index 7c5d87de..c1fa9749 100644 --- a/Makefile +++ b/Makefile @@ -37,9 +37,9 @@ run: $(iso) iso: $(iso) -$(iso): $(kernel) +$(iso): $(kernel) $(grub_cfg) @mkdir -p build/isofiles/boot/grub - @cp $(kernel) build/isofiles/boot/ + @cp $(kernel) build/isofiles/boot/kernel.bin @cp $(grub_cfg) build/isofiles/boot/grub @grub-mkrescue -o $(iso) build/isofiles 2> /dev/null @rm -r build/isofiles diff --git a/src/arch/x86_64/grub.cfg b/src/arch/x86_64/grub.cfg index 70df685c..9713ba02 100644 --- a/src/arch/x86_64/grub.cfg +++ b/src/arch/x86_64/grub.cfg @@ -16,6 +16,6 @@ set timeout=0 set default=0 menuentry "my os" { - multiboot2 /boot/kernel-x86_64.bin + multiboot2 /boot/kernel.bin boot }