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" am: 8951c1313d am: 6befc485c7

Browse source 
am: f00d05610b

Change-Id: I8a7dd60f99cfcda88b01892c129af24e3f61a3aa
This commit is contained in:
Bowgo Tsai 2017-03-01 18:36:48 +00:00 • committed by android-build-merger
commit 9cce616cea
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. */
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
if (!is_dt_fstab_compatible()) {
LOG(INFO) << "Early mount skipped (missing/incompatible fstab in device tree)";