summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShikha Malhotra <shikhamalhotra@google.com>2022-03-22 18:05:45 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-22 18:05:45 +0100
commitd8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1 (patch)
treec314cb5264710c3af02d5209b57cf3843e3ac2fd
parentMerge "Remove support for converting from FDE to FBE" am: 37a4f4d243 am: a062eda2e8 am: 41475f64f7 (diff)
parentMerge "Enable ProjectID by default." am: 29e218afd6 am: de26b580d7 (diff)
downloadandroid_bootable_recovery-d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1.tar
android_bootable_recovery-d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1.tar.gz
android_bootable_recovery-d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1.tar.bz2
android_bootable_recovery-d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1.tar.lz
android_bootable_recovery-d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1.tar.xz
android_bootable_recovery-d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1.tar.zst
android_bootable_recovery-d8c1cc4e7cabb8ddfb6de82a6c0f8fede53c53c1.zip
-rw-r--r--recovery_utils/roots.cpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp
index 7fe385b5e..5c95cba07 100644
--- a/recovery_utils/roots.cpp
+++ b/recovery_utils/roots.cpp
@@ -154,11 +154,9 @@ int format_volume(const std::string& volume, const std::string& directory) {
}
bool needs_casefold = false;
- bool needs_projid = false;
if (volume == "/data") {
needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false);
- needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
}
int64_t length = 0;
@@ -202,11 +200,10 @@ int format_volume(const std::string& volume, const std::string& directory) {
"/system/bin/mke2fs", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize),
};
- // Project ID's require wider inodes. The Quotas themselves are enabled by tune2fs on boot.
- if (needs_projid) {
- mke2fs_args.push_back("-I");
- mke2fs_args.push_back("512");
- }
+ // Following is added for Project ID's quota as they require wider inodes.
+ // The Quotas themselves are enabled by tune2fs on boot.
+ mke2fs_args.push_back("-I");
+ mke2fs_args.push_back("512");
if (v->fs_mgr_flags.ext_meta_csum) {
mke2fs_args.push_back("-O");
@@ -255,10 +252,10 @@ int format_volume(const std::string& volume, const std::string& directory) {
"-g",
"android",
};
- if (needs_projid) {
- make_f2fs_cmd.push_back("-O");
- make_f2fs_cmd.push_back("project_quota,extra_attr");
- }
+
+ make_f2fs_cmd.push_back("-O");
+ make_f2fs_cmd.push_back("project_quota,extra_attr");
+
if (needs_casefold) {
make_f2fs_cmd.push_back("-O");
make_f2fs_cmd.push_back("casefold");