Skip to content

Commit 4c8d326

Browse files
fix branding colour and spacing in limine config
1 parent f5bbb95 commit 4c8d326

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

cmake/custom_targets.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,5 @@ function(iso TARGETFILE SOURCEFILE)
151151
add_custom_command(OUTPUT ${OUTNAME}
152152
COMMAND php ../build-boot-image.php && xorriso -as mkisofs --quiet -b limine-cd.bin -joliet -no-emul-boot -boot-load-size 4 -boot-info-table -V "RETROROCKET" --protective-msdos-label "${CMAKE_BINARY_DIR}/iso" -o "${CMAKE_BINARY_DIR}/rr.iso"
153153
DEPENDS SYMBOLS "kernel.bin" "RUN_run.sh" "DEBUG_debug.sh" ${basic_program_list} ${basic_library_list} ${keymap_list} ${TIMEZONE_TARGETS})
154-
add_dependencies(ISO SYMBOLS "kernel.bin" "RUN_run.sh" "DEBUG_debug.sh")
154+
add_dependencies(ISO SYMBOLS "kernel.bin" "RUN_run.sh" "DEBUG_debug.sh" "config_limine.cfg")
155155
endfunction()

limine.cfg

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ TIMEOUT=5
22
GRAPHICS=1
33
INTERFACE_RESOLUTION=1920x1080
44
RANDOMIZE_MEMORY=0
5-
INTERFACE_BRANDING="Retro Rocket"
5+
INTERFACE_BRANDING=Retro Rocket
6+
INTERFACE_BRANDING_COLOUR=3;1;40
67

7-
:RetroRocket
8+
:Retro Rocket
89
PROTOCOL=limine
910
RESOLUTION=1920x1080x32
1011
KASLR=no
1112
KERNEL_PATH=boot:///kernel.bin
1213
MODULE_CMDLINE=Symbols
1314
MODULE_PATH=boot:///kernel.sym
1415

15-
:Install RetroRocket
16+
:Install Retro Rocket
1617
PROTOCOL=limine
1718
RESOLUTION=1920x1080x32
1819
KASLR=no

src/fs/installer.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,7 @@ bool install_gpt_esp_rfs_whole_image(const char *devname, const char *esp_image_
394394
/* Mount the newly formatted volume */
395395
filesystem_mount("/harddisk", devname, "rfs");
396396

397-
/* TODO: Copy OS files onto RFS; /system, an empty /devices, /programs */
398397
kprintf("Copying files...\n");
399-
400398
copy_directory("/system", "/harddisk/system");
401399
copy_directory("/programs", "/harddisk/programs");
402400
copy_directory("/images", "/harddisk/images");

src/fs/retrofs/getdirectory.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ fs_directory_entry_t *rfs_walk_directory(fs_tree_t *tree, rfs_t *info, uint64_t
5959
/* No continuations left */
6060
break;
6161
} else {
62-
if (!rfs_read_device(info, start_entry->continuation, RFS_SECTOR_SIZE * RFS_DEFAULT_DIR_SIZE,
63-
&block)) {
62+
if (!rfs_read_device(info, start_entry->continuation, RFS_SECTOR_SIZE * RFS_DEFAULT_DIR_SIZE, &block)) {
6463
dprintf("rfs: Error reading next directory chain from %lu", start_entry->continuation);
6564
return list;
6665
}

0 commit comments

Comments
 (0)