ecoppens/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests Activity

preinit: improve error logging for fork_exec

Browse source
This commit is contained in:
Daniel Barlow 2023-10-12 19:00:57 +01:00
parent c341eb46b6
commit 0693cf23d8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/preinit/preinit.c
View file

@ -24,14 +24,14 @@ static int begins_with(char * str, char * prefix)
return 1; return 1;
} }
static void fork_exec(char * command, char *args[]) static int fork_exec(char * command, char *args[])
{ {
int fork_pid = fork(); int fork_pid = fork();
AVER(fork_pid); AVER(fork_pid);
if(fork_pid > 0) if(fork_pid > 0)
wait(NULL); wait(NULL);
else else
AVER(execve(command, args, NULL)); return execve(command, args, NULL);
} }
char banner[] = "Running pre-init...\n"; char banner[] = "Running pre-init...\n";
@ -69,12 +69,12 @@ int main(int argc, char *argv[], char *envp[])
write(1, rootdevice, strlen(rootdevice)); write(1, rootdevice, strlen(rootdevice));
write(1, "\n", 1); write(1, "\n", 1);
AVER(mount(rootdevice, "/target/persist", "jffs2", 0, NULL)); AVER(mount(rootdevice, "/target/persist", "ubifs", 0, NULL));
AVER(mount("/target/persist/nix", "/target/nix", AVER(mount("/target/persist/nix", "/target/nix",
"bind", MS_BIND, NULL)); "bind", MS_BIND, NULL));
char *exec_args[] = { "activate", "/target", NULL }; char *exec_args[] = { "activate", "/target", NULL };
fork_exec("/target/persist/activate", exec_args); AVER(fork_exec("/target/persist/activate", exec_args));
AVER(chdir("/target")); AVER(chdir("/target"));
AVER(mount("/target", "/", "bind", MS_BIND | MS_REC, NULL)); AVER(mount("/target", "/", "bind", MS_BIND | MS_REC, NULL));