diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-29 20:22:58 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-29 20:23:04 +0100 |
| commit | 1533521bff4121dcd8dc37ef34fd09fc6a5018fb (patch) | |
| tree | caeca762cedb4772b651b23d4e92853008633a72 /common/startup.c | |
| parent | 5a9d53c47e3c6ce5bc7d38c60501a37ce2c2b276 (diff) | |
| download | barebox-1533521bff4121dcd8dc37ef34fd09fc6a5018fb.tar.gz barebox-1533521bff4121dcd8dc37ef34fd09fc6a5018fb.tar.xz | |
loadenv: allow more fine grained environment loading
This implements two new options for the loadenv command:
-s: removes (scrubs) old directory contents to be able to
create a fresh environment from for example /dev/defaultenv
-n: no overwrite. Do not overwrite existing files. This allows
to keep parts of the old environment.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/startup.c')
| -rw-r--r-- | common/startup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/startup.c b/common/startup.c index 7bb3c73c12..14409a217d 100644 --- a/common/startup.c +++ b/common/startup.c @@ -108,12 +108,12 @@ void start_barebox (void) debug("initcalls done\n"); #ifdef CONFIG_ENV_HANDLING - if (envfs_load(default_environment_path, "/env")) { + if (envfs_load(default_environment_path, "/env", 0)) { #ifdef CONFIG_DEFAULT_ENVIRONMENT printf("no valid environment found on %s. " "Using default environment\n", default_environment_path); - envfs_load("/dev/defaultenv", "/env"); + envfs_load("/dev/defaultenv", "/env", 0); #endif } #endif |