diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:44 +0100 |
| commit | 144358e0aa102c84968443460c508eb3d65ccc90 (patch) | |
| tree | 01b9aafde793d1124976ecd2bae090b9b978f8a3 /common/startup.c | |
| parent | e358922a74b01e6272c77caf01bc78a8295cc7d7 (diff) | |
| parent | 86f681abec4f8485d2e95537e0d59a8d9ab6b546 (diff) | |
| download | barebox-144358e0aa102c84968443460c508eb3d65ccc90.tar.gz barebox-144358e0aa102c84968443460c508eb3d65ccc90.tar.xz | |
Merge branch 'for-next/nfs'
Conflicts:
defaultenv/defaultenv-2-base/bin/ifup
Diffstat (limited to 'common/startup.c')
| -rw-r--r-- | common/startup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/startup.c b/common/startup.c index 9c4e995a5e..ceb597b0eb 100644 --- a/common/startup.c +++ b/common/startup.c @@ -47,9 +47,9 @@ extern initcall_t __barebox_initcalls_start[], __barebox_early_initcalls_end[], #if defined CONFIG_FS_RAMFS && defined CONFIG_FS_DEVFS static int mount_root(void) { - mount("none", "ramfs", "/"); + mount("none", "ramfs", "/", NULL); mkdir("/dev", 0); - mount("none", "devfs", "/dev"); + mount("none", "devfs", "/dev", NULL); return 0; } fs_initcall(mount_root); @@ -95,11 +95,11 @@ void __noreturn start_barebox(void) pr_info("running /env/bin/init...\n"); if (!stat("/env/bin/init", &s)) { - run_command("source /env/bin/init", 0); + run_command("source /env/bin/init"); } else { pr_err("/env/bin/init not found\n"); if (IS_ENABLED(CONFIG_CMD_LOGIN)) - while(run_command("login -t 0", 0)); + while(run_command("login -t 0")); } } |