[PATCH] Revert "startup: Load default environment earlier"

[Sascha Hauer]

Several boards use defaultenv_append_directory() to append a board
specific envfs snippet during runtime. This only works when
defaultenv_append_directory() is called before defaultenv_load() is
exectuted. Since that was executed at the end of the start process
every initcall level could be used to append a env directory. With this
patch only initcall levels earlier than fsdevice_initcall work and
most boards do not cope with this.

Revert this patch until a better solution is found.

Reported-by: Alexander Kurz <akurz at blala.de>

This reverts commit 5b92cfceff38f3a6462a21cf6b69159ad0ae9744.
---
 common/startup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/startup.c b/common/startup.c
index 8940674528..8553849cb3 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -67,9 +67,6 @@ static int mount_root(void)
 		mount("none", "pstore", "/pstore", NULL);
 	}
 
-	if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT))
-		defaultenv_load("/env", 0);
-
 	return 0;
 }
 fs_initcall(mount_root);
@@ -82,6 +79,9 @@ static int load_environment(void)
 
 	default_environment_path = default_environment_path_get();
 
+	if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT))
+		defaultenv_load("/env", 0);
+
 	envfs_load(default_environment_path, "/env", 0);
 	nvvar_load();
 
-- 
2.16.1