ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all"

Browse source 
* commit '2d8be6c2790333479ac9ff84078d7de9903d64fb':
  init: import init rc scripts from file systems after mount_all
This commit is contained in:
Tom Cherry 2015-08-21 20:20:43 +00:00 • committed by Android Git Automerger
commit 08a6775f8c
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
init/builtins.cpp
View file

@ -427,6 +427,19 @@ static int wipe_data_via_recovery()
while (1) { pause(); } // never reached while (1) { pause(); } // never reached
} }
void import_late()
{
static const std::vector<std::string> init_directories = {
"/system/etc/init",
"/vendor/etc/init",
"/odm/etc/init"
};
for (const auto& dir : init_directories) {
init_parse_config(dir.c_str());
}
}
/* /*
* This function might request a reboot, in which case it will * This function might request a reboot, in which case it will
* not return. * not return.
@ -478,6 +491,8 @@ int do_mount_all(const std::vector<std::string>& args)
return -1; return -1;
} }
import_late();
if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) { if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {
property_set("vold.decrypt", "trigger_encryption"); property_set("vold.decrypt", "trigger_encryption");
} else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) { } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {