summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-01-08 20:49:20 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-01-08 20:49:20 +0100
commit22a27f99659c4ed76462a3aa95f7ff43ea5a976b (patch)
treef1c1a2b84e53d9c3c66bc302255239f225c28cb4 /updater
parentMerge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" (diff)
parentUse dynamically linked f2fs executables. (diff)
downloadandroid_bootable_recovery-22a27f99659c4ed76462a3aa95f7ff43ea5a976b.tar
android_bootable_recovery-22a27f99659c4ed76462a3aa95f7ff43ea5a976b.tar.gz
android_bootable_recovery-22a27f99659c4ed76462a3aa95f7ff43ea5a976b.tar.bz2
android_bootable_recovery-22a27f99659c4ed76462a3aa95f7ff43ea5a976b.tar.lz
android_bootable_recovery-22a27f99659c4ed76462a3aa95f7ff43ea5a976b.tar.xz
android_bootable_recovery-22a27f99659c4ed76462a3aa95f7ff43ea5a976b.tar.zst
android_bootable_recovery-22a27f99659c4ed76462a3aa95f7ff43ea5a976b.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/install.cpp9
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("");
}