summaryrefslogtreecommitdiffstats
path: root/fsck_unshare_blocks.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-05-11 01:58:32 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-05-11 01:58:32 +0200
commitba8f38d7418a813c37647e9c7cf5cfa7fc9e2f26 (patch)
treea95adea292d94af550e1a1c8c0ed1c036d63f340 /fsck_unshare_blocks.cpp
parentMerge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." (diff)
parentroots: Remove get_system_root and logical_partitions_mapped. (diff)
downloadandroid_bootable_recovery-ba8f38d7418a813c37647e9c7cf5cfa7fc9e2f26.tar
android_bootable_recovery-ba8f38d7418a813c37647e9c7cf5cfa7fc9e2f26.tar.gz
android_bootable_recovery-ba8f38d7418a813c37647e9c7cf5cfa7fc9e2f26.tar.bz2
android_bootable_recovery-ba8f38d7418a813c37647e9c7cf5cfa7fc9e2f26.tar.lz
android_bootable_recovery-ba8f38d7418a813c37647e9c7cf5cfa7fc9e2f26.tar.xz
android_bootable_recovery-ba8f38d7418a813c37647e9c7cf5cfa7fc9e2f26.tar.zst
android_bootable_recovery-ba8f38d7418a813c37647e9c7cf5cfa7fc9e2f26.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);