summaryrefslogtreecommitdiffstats
path: root/fsck_unshare_blocks.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-05-11 03:08:37 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-05-11 03:08:37 +0200
commitfb4f72cb7c332b8d30c2fa91efb8964dcb5fb879 (patch)
treee5774da156ac764677e4b27f16b7b2f86ab00536 /fsck_unshare_blocks.cpp
parent[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s ours (diff)
parentMerge "roots: Remove get_system_root and logical_partitions_mapped." (diff)
downloadandroid_bootable_recovery-fb4f72cb7c332b8d30c2fa91efb8964dcb5fb879.tar
android_bootable_recovery-fb4f72cb7c332b8d30c2fa91efb8964dcb5fb879.tar.gz
android_bootable_recovery-fb4f72cb7c332b8d30c2fa91efb8964dcb5fb879.tar.bz2
android_bootable_recovery-fb4f72cb7c332b8d30c2fa91efb8964dcb5fb879.tar.lz
android_bootable_recovery-fb4f72cb7c332b8d30c2fa91efb8964dcb5fb879.tar.xz
android_bootable_recovery-fb4f72cb7c332b8d30c2fa91efb8964dcb5fb879.tar.zst
android_bootable_recovery-fb4f72cb7c332b8d30c2fa91efb8964dcb5fb879.zip
Diffstat (limited to 'fsck_unshare_blocks.cpp')
-rw-r--r--fsck_unshare_blocks.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/fsck_unshare_blocks.cpp b/fsck_unshare_blocks.cpp
index 0f8ffface..9dc0fd8ec 100644
--- a/fsck_unshare_blocks.cpp
+++ b/fsck_unshare_blocks.cpp
@@ -34,6 +34,7 @@
#include <android-base/logging.h>
#include <android-base/properties.h>
#include <android-base/unique_fd.h>
+#include <fs_mgr/roots.h>
#include "otautil/roots.h"
@@ -119,7 +120,7 @@ bool do_fsck_unshare_blocks() {
std::vector<std::string> partitions = { "/odm", "/oem", "/product", "/vendor" };
// Temporarily mount system so we can copy e2fsck_static.
- std::string system_root = get_system_root();
+ auto system_root = android::fs_mgr::GetSystemRoot();
bool mounted = ensure_path_mounted_at(system_root, "/mnt/system") != -1;
partitions.push_back(system_root);