diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2018-10-11 21:22:18 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-11 21:22:18 +0200 |
| commit | 9320e18f5de0ee735819963b5c888a6b2d8d0c62 (patch) | |
| tree | ea0e7c2c968d5399b252c6e08e4c00923ac2cce5 /fsck_unshare_blocks.cpp | |
| parent | Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively" (diff) | |
| parent | Merge "recovery: deprecate check for ro.build.system_root_image" (diff) | |
| download | android_bootable_recovery-9320e18f5de0ee735819963b5c888a6b2d8d0c62.tar android_bootable_recovery-9320e18f5de0ee735819963b5c888a6b2d8d0c62.tar.gz android_bootable_recovery-9320e18f5de0ee735819963b5c888a6b2d8d0c62.tar.bz2 android_bootable_recovery-9320e18f5de0ee735819963b5c888a6b2d8d0c62.tar.lz android_bootable_recovery-9320e18f5de0ee735819963b5c888a6b2d8d0c62.tar.xz android_bootable_recovery-9320e18f5de0ee735819963b5c888a6b2d8d0c62.tar.zst android_bootable_recovery-9320e18f5de0ee735819963b5c888a6b2d8d0c62.zip | |
Diffstat (limited to '')
| -rw-r--r-- | fsck_unshare_blocks.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fsck_unshare_blocks.cpp b/fsck_unshare_blocks.cpp index 2e6b5b807..684958e38 100644 --- a/fsck_unshare_blocks.cpp +++ b/fsck_unshare_blocks.cpp @@ -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."; |