tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319

Browse source 
am: fc0f970c93

Change-Id: I6c7065aeb42a4a9b4593e75ecfdb723c9971d37d
This commit is contained in:
Jaegeuk Kim 2018-04-04 14:01:54 -07:00 committed by android-build-merger
commit 21293778f3
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
roots.cpp
View file

@ -324,19 +324,34 @@ int format_volume(const char* volume, const char* directory) {
}
// Has to be f2fs because we checked earlier.
static constexpr int kSectorSize = 4096;
std::string cmd("/sbin/mkfs.f2fs");
std::vector<std::string> make_f2fs_cmd = { cmd, "-d1", "-f", "-O",
"encrypt", "-O", "quota", v->blk_device };
if (length >= 512) {
make_f2fs_cmd.push_back(std::to_string(length / 512));
// clang-format off
std::vector<std::string> make_f2fs_cmd = {
cmd,
"-d1",
"-f",
"-O", "encrypt",
"-O", "quota",
"-w", std::to_string(kSectorSize),
v->blk_device,
};
// clang-format on
if (length >= kSectorSize) {
make_f2fs_cmd.push_back(std::to_string(length / kSectorSize));
}
int result = exec_cmd(make_f2fs_cmd);
if (result == 0 && directory != nullptr) {
cmd = "/sbin/sload.f2fs";
// clang-format off
std::vector<std::string> sload_f2fs_cmd = {
cmd, "-f", directory, "-t", volume, v->blk_device,
cmd,
"-f", directory,
"-t", volume,
v->blk_device,
};
// clang-format on
result = exec_cmd(sload_f2fs_cmd);
}
if (result != 0) {