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

Commit fdea242a authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

recovery: deprecate check for ro.build.system_root_image 

If there is a "/system" in the fstab, then can not be a
system as root image.

Test: compile
Bug: 109821005
Change-Id: I2c852dcbdcf6de437d39039937799feeef949516
parent 1a4d234d

fsck_unshare_blocks.cpp

+4 −3
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 


static constexpr const char* SYSTEM_E2FSCK_BIN = "/system/bin/e2fsck_static";

static constexpr const char* TMP_E2FSCK_BIN = "/tmp/e2fsck.bin";

static constexpr const char* SYSTEM_ROOT = "/system";



static bool copy_file(const char* source, const char* dest) {

  android::base::unique_fd source_fd(open(source, O_RDONLY));
@@ -121,12 +122,12 @@ bool do_fsck_unshare_blocks() { 


  // Temporarily mount system so we can copy e2fsck_static.

  bool mounted = false;

  if (android::base::GetBoolProperty("ro.build.system_root_image", false)) {

  if (volume_for_mount_point(SYSTEM_ROOT) == nullptr) {

    mounted = ensure_path_mounted_at("/", "/mnt/system") != -1;

    partitions.push_back("/");

  } else {

    mounted = ensure_path_mounted_at("/system", "/mnt/system") != -1;

    partitions.push_back("/system");

    mounted = ensure_path_mounted_at(SYSTEM_ROOT, "/mnt/system") != -1;

    partitions.push_back(SYSTEM_ROOT);

  }

  if (!mounted) {

    LOG(ERROR) << "Failed to mount system image.";

recovery.cpp

+3 −2
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static constexpr const char* CACHE_ROOT = "/cache"; 
static constexpr const char* DATA_ROOT = "/data";

static constexpr const char* METADATA_ROOT = "/metadata";

static constexpr const char* SDCARD_ROOT = "/sdcard";

static constexpr const char* SYSTEM_ROOT = "/system";



// We define RECOVERY_API_VERSION in Android.mk, which will be picked up by build system and packed

// into target_files.zip. Assert the version defined in code and in Android.mk are consistent.
@@ -852,12 +853,12 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) { 
      }

      case Device::MOUNT_SYSTEM:

        // the system partition is mounted at /mnt/system

        if (android::base::GetBoolProperty("ro.build.system_root_image", false)) {

        if (volume_for_mount_point(SYSTEM_ROOT) == nullptr) {

          if (ensure_path_mounted_at("/", "/mnt/system") != -1) {

            ui->Print("Mounted /system.\n");

          }

        } else {

          if (ensure_path_mounted_at("/system", "/mnt/system") != -1) {

          if (ensure_path_mounted_at(SYSTEM_ROOT, "/mnt/system") != -1) {

            ui->Print("Mounted /system.\n");

          }

        }