Merge "init: skip early mount in recovery mode" am: 8951c1313d

am: 6befc485c7

Change-Id: I5963d2f181fe9ce9bfed982f54a8e1b152d7dd26
This commit is contained in:
Bowgo Tsai 2017-03-01 18:31:18 +00:00 committed by android-build-merger
commit f00d05610b

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)";