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

Merge "init: skip early mount in recovery mode"

Browse source
This commit is contained in:
Treehugger Robot 2017-03-01 18:21:17 +00:00 • committed by Gerrit Code Review
commit 8951c1313d
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/init.cpp
View file

@ -790,6 +790,12 @@ static bool get_early_partitions(const std::vector<fstab_rec*>& early_fstab_recs
/* Early mount vendor and ODM partitions. The fstab is read from device-tree. */ /* Early mount vendor and ODM partitions. The fstab is read from device-tree. */
static bool early_mount() { static bool early_mount() {
// skip early mount if we're in recovery mode
if (access("/sbin/recovery", F_OK) == 0) {
LOG(INFO) << "Early mount skipped (recovery mode)";
return true;
}
// first check if device tree fstab entries are compatible // first check if device tree fstab entries are compatible
if (!is_dt_fstab_compatible()) { if (!is_dt_fstab_compatible()) {
LOG(INFO) << "Early mount skipped (missing/incompatible fstab in device tree)"; LOG(INFO) << "Early mount skipped (missing/incompatible fstab in device tree)";