PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "recovery: format f2fs with encrypt/quota"

Browse Source
This commit is contained in:
Treehugger Robot
2017-11-14 01:49:26 +00:00
committed by Gerrit Code Review
parent de07371b03 1a8bb0f542
commit d4b6e25fdd
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roots.cpp
+3 -1
View File
@@ -321,7 +321,9 @@ int format_volume(const char* volume, const char* directory) {
} }
// Has to be f2fs because we checked earlier. // Has to be f2fs because we checked earlier.
std::vector<std::string> f2fs_args = { "/sbin/mkfs.f2fs", "-t", "-d1", v->blk_device }; std::vector<std::string> f2fs_args = { "/sbin/mkfs.f2fs", "-d1", "-f",
"-O", "encrypt", "-O", "quota",
v->blk_device };
if (length >= 512) { if (length >= 512) {
f2fs_args.push_back(std::to_string(length / 512)); f2fs_args.push_back(std::to_string(length / 512));
} }
updater/install.cpp
+10 -4
View File
@@ -303,10 +303,16 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
std::string num_sectors = std::to_string(size / 512); std::string num_sectors = std::to_string(size / 512);
const char* f2fs_path = "/sbin/mkfs.f2fs"; const char* f2fs_path = "/sbin/mkfs.f2fs";
const char* f2fs_argv[] = { const char* f2fs_argv[] = { "mkfs.f2fs",
"mkfs.f2fs", "-t", "-d1", location.c_str(), (size < 512) ? nullptr : num_sectors.c_str(), "-d1",
nullptr "-f",
}; "-O",
"encrypt",
"-O",
"quota",
location.c_str(),
(size < 512) ? nullptr : num_sectors.c_str(),
nullptr };
int status = exec_cmd(f2fs_path, const_cast<char**>(f2fs_argv)); int status = exec_cmd(f2fs_path, const_cast<char**>(f2fs_argv));
if (status != 0) { if (status != 0) {
LOG(ERROR) << name << ": mkfs.f2fs failed (" << status << ") on " << location; LOG(ERROR) << name << ": mkfs.f2fs failed (" << status << ") on " << location;