summaryrefslogtreecommitdiffstats
path: root/roots.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-06-21 00:16:21 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-06-21 00:16:21 +0200
commit9b5d4ea20f529b840422e4a0c842f427cc801942 (patch)
tree460e171f863c35fe3a4fb9dcb8ef0c78226c3a43 /roots.cpp
parentMerge "applypatch: Clean up the function comments." (diff)
parente2fsdroid and mke2fs are dynamic executable in recovery partition (diff)
downloadandroid_bootable_recovery-9b5d4ea20f529b840422e4a0c842f427cc801942.tar
android_bootable_recovery-9b5d4ea20f529b840422e4a0c842f427cc801942.tar.gz
android_bootable_recovery-9b5d4ea20f529b840422e4a0c842f427cc801942.tar.bz2
android_bootable_recovery-9b5d4ea20f529b840422e4a0c842f427cc801942.tar.lz
android_bootable_recovery-9b5d4ea20f529b840422e4a0c842f427cc801942.tar.xz
android_bootable_recovery-9b5d4ea20f529b840422e4a0c842f427cc801942.tar.zst
android_bootable_recovery-9b5d4ea20f529b840422e4a0c842f427cc801942.zip
Diffstat (limited to 'roots.cpp')
-rw-r--r--roots.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/roots.cpp b/roots.cpp
index 26ebf1fbe..2b26bf43e 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -283,7 +283,7 @@ int format_volume(const char* volume, const char* directory) {
if (strcmp(v->fs_type, "ext4") == 0) {
static constexpr int kBlockSize = 4096;
std::vector<std::string> mke2fs_args = {
- "/sbin/mke2fs_static", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize),
+ "/system/bin/mke2fs", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize),
};
int raid_stride = v->logical_blk_size / kBlockSize;
@@ -305,13 +305,7 @@ int format_volume(const char* volume, const char* directory) {
int result = exec_cmd(mke2fs_args);
if (result == 0 && directory != nullptr) {
std::vector<std::string> e2fsdroid_args = {
- "/sbin/e2fsdroid_static",
- "-e",
- "-f",
- directory,
- "-a",
- volume,
- v->blk_device,
+ "/system/bin/e2fsdroid", "-e", "-f", directory, "-a", volume, v->blk_device,
};
result = exec_cmd(e2fsdroid_args);
}