From 52d0bfeaaef9bb4d3a7db47738fd2c73a3c48d18 Mon Sep 17 00:00:00 2001 From: Karina Date: Fri, 30 Jan 2026 17:25:01 +0400 Subject: [PATCH] chore(cpio): moved initramfs binary files to /bin/* --- kernel/src/core/loader.c | 4 ++-- kernel/src/syscalls/proc.c | 1 + userspace/init/src/main.c | 2 +- userspace/libterm/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/src/core/loader.c b/kernel/src/core/loader.c index 4db4014..75be23b 100644 --- a/kernel/src/core/loader.c +++ b/kernel/src/core/loader.c @@ -58,9 +58,9 @@ i32 process_spawn(const char* path, const char* name) { } void init_task_entry() { - i32 pid = process_spawn("/init", "init"); + i32 pid = process_spawn("/bin/init", "init"); if (pid < 0) { - panic("FATAL: Failed to spawn /init"); + panic("FATAL: Failed to spawn /bin/init"); } while (1) { __asm__("sti; hlt"); } diff --git a/kernel/src/syscalls/proc.c b/kernel/src/syscalls/proc.c index cd01e8e..c0c5e18 100644 --- a/kernel/src/syscalls/proc.c +++ b/kernel/src/syscalls/proc.c @@ -3,6 +3,7 @@ #include #include +#include #include #include diff --git a/userspace/init/src/main.c b/userspace/init/src/main.c index 61398c1..33e9095 100644 --- a/userspace/init/src/main.c +++ b/userspace/init/src/main.c @@ -6,7 +6,7 @@ #include int main() { - wait(spawn("termosh")); // TODO: read .cfg and spawn what stated there + wait(spawn("/bin/termosh")); // TODO: read .cfg and spawn what stated there printf("\nbaiii"); return 0; } \ No newline at end of file diff --git a/userspace/libterm/CMakeLists.txt b/userspace/libterm/CMakeLists.txt index 8c62fca..a4f59b9 100644 --- a/userspace/libterm/CMakeLists.txt +++ b/userspace/libterm/CMakeLists.txt @@ -54,7 +54,7 @@ function(add_termos_executable NAME SOURCES) ) set(ELF2HOT_DIR "${CMAKE_SOURCE_DIR}/tools/elf2hot") - set(FINAL_HOT_PATH "${CMAKE_SOURCE_DIR}/initramfs/${NAME}") + set(FINAL_HOT_PATH "${CMAKE_SOURCE_DIR}/initramfs/bin/${NAME}") add_custom_command(TARGET ${NAME} POST_BUILD COMMAND cargo run --release --quiet -- $ ${FINAL_HOT_PATH}