openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "fs_mgr: Don't try to suffix "vroot" with "-verity"." 

am: 55f8b894a3

Change-Id: I29fac2f7785850749f67762b03c9488750f64238
This commit is contained in:
David Anderson 2019-05-10 13:16:24 -07:00 committed by android-build-merger
parent 2cf161bcc7 55f8b894a3
commit d08cf577a9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs_mgr/fs_mgr_fstab.cpp
View File

@ -801,8 +801,11 @@ FstabEntry BuildGsiSystemFstabEntry() {
std::string GetVerityDeviceName(const FstabEntry& entry) {
std::string base_device;
if (entry.mount_point == "/") {
// In AVB, the dm device name is vroot instead of system.
base_device = entry.fs_mgr_flags.avb ? "vroot" : "system";
// When using system-as-root, the device name is fixed as "vroot".
if (entry.fs_mgr_flags.avb) {
return "vroot";
}
base_device = "system";
} else {
base_device = android::base::Basename(entry.mount_point);
}