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 /commands/boot.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 'commands/boot.c')
| -rw-r--r-- | commands/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commands/boot.c b/commands/boot.c index ccf5827a59..bb8d07fce4 100644 --- a/commands/boot.c +++ b/commands/boot.c @@ -47,7 +47,7 @@ static int boot_script(char *path) globalvar_set_match("linux.bootargs.dyn.", ""); globalvar_set_match("bootm.", ""); - ret = run_command(path, 0); + ret = run_command(path); if (ret) { printf("Running %s failed\n", path); goto out; |