From 5b92cfceff38f3a6462a21cf6b69159ad0ae9744 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 17 May 2016 08:28:42 +0200 Subject: startup: Load default environment earlier Some files compiled into the default environment may be needed earlier in the boot process, so move loading of the default environment to fs_initcall. Only the default environment is loaded earlier, but not the overwriting with the persistent environment files, so when the files are used that early, only the compiled in version is available; it's not overwritable at that time. Signed-off-by: Sascha Hauer --- common/startup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common/startup.c') diff --git a/common/startup.c b/common/startup.c index 432be67cd6..8b075422dd 100644 --- a/common/startup.c +++ b/common/startup.c @@ -66,6 +66,9 @@ 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); @@ -78,9 +81,6 @@ 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(); -- cgit v1.2.3