commit d2f517a4e9b05f2176c134e9d7b06e2e9e59d809
parent 0f38ee0e9c8fcac3c0ea12b21cc210f6befb8564
Author: Daniel Barlow <dan@telent.net>
Date: Thu, 19 Oct 2023 19:07:13 +0100
preinit.c: reindent
Diffstat:
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/pkgs/preinit/preinit.c b/pkgs/preinit/preinit.c
@@ -14,23 +14,23 @@ void parseopts(char * cmdline, char **root, char **rootfstype);
static int begins_with(char * str, char * prefix)
{
- while(*prefix) {
- if(*str == '\0') return 0;
- if(*str != *prefix) return 0;
- str++;
- prefix++;
- }
- return 1;
+ while(*prefix) {
+ if(*str == '\0') return 0;
+ if(*str != *prefix) return 0;
+ str++;
+ prefix++;
+ }
+ return 1;
}
static int fork_exec(char * command, char *args[])
{
- int fork_pid = fork();
- AVER(fork_pid);
- if(fork_pid > 0)
- wait(NULL);
- else
- return execve(command, args, NULL);
+ int fork_pid = fork();
+ AVER(fork_pid);
+ if(fork_pid > 0)
+ wait(NULL);
+ else
+ return execve(command, args, NULL);
}
char banner[] = "Running pre-init...\n";
@@ -38,45 +38,45 @@ char buf[COMMAND_LINE_SIZE];
int main(int argc, char *argv[], char *envp[])
{
- char *rootdevice = 0;
- char *rootfstype = 0;
- char *p = buf;
- write(1, banner, strlen(banner));
+ char *rootdevice = 0;
+ char *rootfstype = 0;
+ char *p = buf;
+ write(1, banner, strlen(banner));
- mount("none", "/proc", "proc", 0, NULL);
+ mount("none", "/proc", "proc", 0, NULL);
- int cmdline = open("/proc/cmdline", O_RDONLY, 0);
+ int cmdline = open("/proc/cmdline", O_RDONLY, 0);
- if(cmdline>=0) {
- int len = read(cmdline, buf, sizeof buf - 1);
- buf[len]='\0';
- write(1, "cmdline ", 8);
- write(1, buf, len);
- };
+ if(cmdline>=0) {
+ int len = read(cmdline, buf, sizeof buf - 1);
+ buf[len]='\0';
+ write(1, "cmdline ", 8);
+ write(1, buf, len);
+ };
- parseopts(buf, &rootdevice, &rootfstype);
+ parseopts(buf, &rootdevice, &rootfstype);
- if(rootdevice) {
- if(!rootfstype) rootfstype = "jffs2"; /* backward compatibility */
- write(1, "rootdevice ", 11);
- write(1, rootdevice, strlen(rootdevice));
- write(1, " (", 2);
- write(1, rootfstype, strlen(rootfstype));
- write(1, ")\n", 1);
+ if(rootdevice) {
+ if(!rootfstype) rootfstype = "jffs2"; /* backward compatibility */
+ write(1, "rootdevice ", 11);
+ write(1, rootdevice, strlen(rootdevice));
+ write(1, " (", 2);
+ write(1, rootfstype, strlen(rootfstype));
+ write(1, ")\n", 1);
- AVER(mount(rootdevice, "/target/persist", rootfstype, 0, NULL));
- AVER(mount("/target/persist/nix", "/target/nix",
- "bind", MS_BIND, NULL));
+ AVER(mount(rootdevice, "/target/persist", rootfstype, 0, NULL));
+ AVER(mount("/target/persist/nix", "/target/nix",
+ "bind", MS_BIND, NULL));
- char *exec_args[] = { "activate", "/target", NULL };
- AVER(fork_exec("/target/persist/activate", exec_args));
- AVER(chdir("/target"));
+ char *exec_args[] = { "activate", "/target", NULL };
+ AVER(fork_exec("/target/persist/activate", exec_args));
+ AVER(chdir("/target"));
- AVER(mount("/target", "/", "bind", MS_BIND | MS_REC, NULL));
- AVER(chroot("."));
- argv[0] = "init";
- argv[1] = NULL;
+ AVER(mount("/target", "/", "bind", MS_BIND | MS_REC, NULL));
+ AVER(chroot("."));
- AVER(execve("/persist/init", argv, envp));
- }
+ argv[0] = "init";
+ argv[1] = NULL;
+ AVER(execve("/persist/init", argv, envp));
+ }
}