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

Merge "fs_mgr: allow any argument to encryptable"

Browse source
This commit is contained in:
Eric Biggers 2021-11-12 22:05:41 +00:00 committed by Gerrit Code Review
commit 2c74197cae
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs_mgr/fs_mgr_fstab.cpp
View file

@ -188,9 +188,9 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
#undef CheckFlag
// Then handle flags that take an argument.
if (flag == "encryptable=userdata") {
if (StartsWith(flag, "encryptable=")) {
// The "encryptable" flag identifies adoptable storage volumes. The
// argument to this flag must be "userdata".
// argument to this flag is ignored, but it should be "userdata".
//
// Historical note: this flag was originally meant just for /data,
// to indicate that FDE (full disk encryption) can be enabled.
@ -198,8 +198,7 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
// storage volumes. Today, FDE is no longer supported, leaving only
// the adoptable storage volume meaning for this flag.
entry->fs_mgr_flags.crypt = true;
} else if (StartsWith(flag, "encryptable=") || StartsWith(flag, "forceencrypt=") ||
StartsWith(flag, "forcefdeorfbe=")) {
} else if (StartsWith(flag, "forceencrypt=") || StartsWith(flag, "forcefdeorfbe=")) {
LERROR << "flag no longer supported: " << flag;
return false;
} else if (StartsWith(flag, "voldmanaged=")) {