mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 23:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

proc: add init and intconsole args; set TERM env on init

Browse Source
This commit is contained in:
Matheus
2026-04-11 22:03:55 -03:00
parent b02461e24f
commit 6877f741ed
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/sys/proc.c
+16 -6
View File
@@ -307,9 +307,19 @@ void proc_exit(void) {
} }
DEFINE_KERNEL_ARGUMENT(initarg, char *); DEFINE_KERNEL_ARGUMENT(initarg, char *);
DEFINE_KERNEL_ARGUMENT(init, char *);
DEFINE_KERNEL_ARGUMENT(initconsole, char *);
void proc_run_init() { void proc_run_init() {
printf("proc: loading /init\n"); char *init_path = GET_KERNEL_ARGUMENT(init, char *);
if (init_path == NULL)
init_path = "/init";
char *init_console = GET_KERNEL_ARGUMENT(initconsole, char *);
if (init_console == NULL)
init_console = "console";
printf("proc: loading %s\n", init_path);
vmmcontext_t *vmmctx = vmm_newcontext(); vmmcontext_t *vmmctx = vmm_newcontext();
__assert(vmmctx); __assert(vmmctx);
@@ -323,7 +333,7 @@ void proc_run_init() {
init_proc = proc; init_proc = proc;
vnode_t *initnode; vnode_t *initnode;
__assert(vfs_open(vfsroot, "/init", 0, &initnode) == 0); __assert(vfs_open(vfsroot, init_path, 0, &initnode) == 0);
auxv64list_t auxv64; auxv64list_t auxv64;
char *interp = NULL; char *interp = NULL;
@@ -340,7 +350,7 @@ void proc_run_init() {
} }
vnode_t *consolenode; vnode_t *consolenode;
__assert(devfs_getbyname("console", &consolenode) == 0); __assert(devfs_getbyname(init_console, &consolenode) == 0);
VOP_LOCK(consolenode); VOP_LOCK(consolenode);
__assert(VOP_OPEN(&consolenode, V_FFLAGS_READ | V_FFLAGS_NOCTTY, &proc->cred) == 0); __assert(VOP_OPEN(&consolenode, V_FFLAGS_READ | V_FFLAGS_NOCTTY, &proc->cred) == 0);
VOP_HOLD(consolenode); VOP_HOLD(consolenode);
@@ -374,10 +384,10 @@ void proc_run_init() {
proc->root = vfsroot; proc->root = vfsroot;
VOP_HOLD(vfsroot); VOP_HOLD(vfsroot);
char *argv[] = {"/init", GET_KERNEL_ARGUMENT(initarg, char *), NULL}; char *argv[] = {init_path, GET_KERNEL_ARGUMENT(initarg, char *), NULL};
char *envp[] = {NULL}; char *envp[] = {"TERM=xterm-256color", NULL};
void *stack = elf_preparestack(STACK_TOP, &auxv64, argv, envp, "/init"); void *stack = elf_preparestack(STACK_TOP, &auxv64, argv, envp, init_path);
__assert(stack); __assert(stack);
// reenter kernel context // reenter kernel context