Revert "startup: Load default environment earlier"

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 <[email protected]> This reverts commit 5b92cfc.
ndreys · Mar 19, 2018 · f9c96e2 · f9c96e2
1 parent d7dacc1
commit f9c96e2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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();