diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-09-24 01:40:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2007-09-24 01:40:06 +0200 |
| commit | 14b5c2a647924440444977806c72b8ee6f586e26 (patch) | |
| tree | 66dbf1b77d7ed2222db20a7a13ac9a7461d16a69 /common/startup.c | |
| parent | d97304aef21a7f3ac5a6699e3549e30507c760a3 (diff) | |
| download | barebox-14b5c2a647924440444977806c72b8ee6f586e26.tar.gz barebox-14b5c2a647924440444977806c72b8ee6f586e26.tar.xz | |
- teach hush to honour PATH variable
- remove common/main.c. This is now handled in the different shells.
Diffstat (limited to 'common/startup.c')
| -rw-r--r-- | common/startup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/startup.c b/common/startup.c index a8f20fb103..7867bd1a50 100644 --- a/common/startup.c +++ b/common/startup.c @@ -130,21 +130,22 @@ void start_uboot (void) mkdir("/env"); mount("none", "devfs", "/dev"); +#ifdef CONFIG_CMD_ENVIRONMENT if (envfs_load("/dev/env0", "/env")) { #ifdef CONFIG_DEFAULT_ENVIRONMENT printf("using default environment\n"); envfs_load("/dev/defaultenv", "/env"); #endif } - +#endif if (!stat("/env/init", &s)) { printf("running /env/init\n"); - run_command("exec /env/init", 0); + run_command("sh /env/init", 0); } /* main_loop() can return to retry autoboot, if so just run it again. */ for (;;) - main_loop (); + run_shell(); /* NOTREACHED - no way out of command loop except booting */ } |