diff --git a/.gitignore b/.gitignore index 6f511abd..e02dfe9a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,4 @@ *.o /bin *.swp -/boot/**/iso/kernel -/boot/**/iso/initrd +/boot/**/iso/ diff --git a/Makefile b/Makefile index 3f14dfac..500725dc 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ $(INITRD): $(call rwildcard,initrd,*) cd initrd;tar -cf $(INITRD) . sysdisk.iso: $(ISO) - cp limine.cfg limine/limine.sys limine/limine-cd.bin limine/limine-cd-efi.bin $(ISO) + cp liminebg.bmp limine.cfg limine/limine.sys limine/limine-cd.bin limine/limine-cd-efi.bin $(ISO) xorriso -as mkisofs -b limine-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot limine-cd-efi.bin -efi-boot-part --efi-boot-image --protective-msdos-label $(ISO) -o sysdisk.iso diff --git a/boot/x86_64/iso/limine-cd-efi.bin b/boot/x86_64/iso/limine-cd-efi.bin deleted file mode 100644 index a430aee6..00000000 Binary files a/boot/x86_64/iso/limine-cd-efi.bin and /dev/null differ diff --git a/boot/x86_64/iso/limine-cd.bin b/boot/x86_64/iso/limine-cd.bin deleted file mode 100644 index a43452f2..00000000 Binary files a/boot/x86_64/iso/limine-cd.bin and /dev/null differ diff --git a/boot/x86_64/iso/limine.cfg b/boot/x86_64/iso/limine.cfg deleted file mode 100644 index ec532a29..00000000 --- a/boot/x86_64/iso/limine.cfg +++ /dev/null @@ -1,5 +0,0 @@ -TIMEOUT=5 -:test -PROTOCOL=limine -KERNEL_PATH=boot:///kernel -MODULE_PATH=boot:///initrd diff --git a/boot/x86_64/iso/limine.sys b/boot/x86_64/iso/limine.sys deleted file mode 100755 index ff1f8e4b..00000000 Binary files a/boot/x86_64/iso/limine.sys and /dev/null differ diff --git a/limine.cfg b/limine.cfg index 2f76e43d..7d503d1c 100644 --- a/limine.cfg +++ b/limine.cfg @@ -1,6 +1,6 @@ -TERM_MARGIN=50 -TERM_MARGIN_GRADIENT=50 -TERM_WALLPAPER=boot:///back1.bmp +TERM_MARGIN=40 +TERM_MARGIN_GRADIENT=40 +TERM_WALLPAPER=boot:///liminebg.bmp TERM_WALLPAPER_STYLE=stretched TIMEOUT=5 :Astral diff --git a/boot/x86_64/iso/back1.bmp b/liminebg.bmp similarity index 100% rename from boot/x86_64/iso/back1.bmp rename to liminebg.bmp