Merge "init: skip early mount in recovery mode"

am: 8951c1313d

Change-Id: Ie9e199acaa9577ad72c6d57cc6cbc1be895fb4a4
This commit is contained in:
Bowgo Tsai 2017-03-01 18:28:48 +00:00 committed by android-build-merger
commit 6befc485c7

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