Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32232724 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

init: skip early mount in recovery mode 

We don't need early mount in recovery mode for security considerations,
e.g., users should explicitly select 'mount /system' from the recovery
menu. This CL checks the existence of file "/sbin/recovery" and skip
early mount when it is found.

Bug: 35853576
Test: early mount /vendor without dm-verity on sailfish
Test: early mount not happen in recovery mode on sailfish
Change-Id: I69cc96f6fd0de6ce493082921738a958dd571115
parent b6cb9b04

init/init.cpp

+6 −0
Original line number Diff line number Diff line
@@ -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)";