diff options
| author | Tao Bao <tbao@google.com> | 2019-01-08 21:09:43 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-08 21:09:43 +0100 |
| commit | e8270a8e988a81453358b65c8ed1ee62deb480d1 (patch) | |
| tree | f1c1a2b84e53d9c3c66bc302255239f225c28cb4 /updater/install.cpp | |
| parent | Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" am: 08a8b40c91 (diff) | |
| parent | Merge "Use dynamically linked f2fs executables." (diff) | |
| download | android_bootable_recovery-e8270a8e988a81453358b65c8ed1ee62deb480d1.tar android_bootable_recovery-e8270a8e988a81453358b65c8ed1ee62deb480d1.tar.gz android_bootable_recovery-e8270a8e988a81453358b65c8ed1ee62deb480d1.tar.bz2 android_bootable_recovery-e8270a8e988a81453358b65c8ed1ee62deb480d1.tar.lz android_bootable_recovery-e8270a8e988a81453358b65c8ed1ee62deb480d1.tar.xz android_bootable_recovery-e8270a8e988a81453358b65c8ed1ee62deb480d1.tar.zst android_bootable_recovery-e8270a8e988a81453358b65c8ed1ee62deb480d1.zip | |
Diffstat (limited to 'updater/install.cpp')
| -rw-r--r-- | updater/install.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index 0e1028bd1..20a204a83 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -482,18 +482,19 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt return StringValue(""); } std::vector<std::string> f2fs_args = { - "/sbin/mkfs.f2fs", "-g", "android", "-w", "512", location + "/system/bin/make_f2fs", "-g", "android", "-w", "512", location }; if (size >= 512) { f2fs_args.push_back(std::to_string(size / 512)); } if (auto status = exec_cmd(f2fs_args); status != 0) { - LOG(ERROR) << name << ": mkfs.f2fs failed (" << status << ") on " << location; + LOG(ERROR) << name << ": make_f2fs failed (" << status << ") on " << location; return StringValue(""); } - if (auto status = exec_cmd({ "/sbin/sload.f2fs", "-t", mount_point, location }); status != 0) { - LOG(ERROR) << name << ": sload.f2fs failed (" << status << ") on " << location; + if (auto status = exec_cmd({ "/system/bin/sload_f2fs", "-t", mount_point, location }); + status != 0) { + LOG(ERROR) << name << ": sload_f2fs failed (" << status << ") on " << location; return StringValue(""); } |