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

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

Browse source 
The vroot device is specified on the kernel command-line, rather than
being created by fs_mgr.

Bug: 132275224
Test: taimen boots
Change-Id: I368450a333f383d434591555a6ea562e1bd0bc1e
This commit is contained in:
David Anderson 2019-05-09 17:55:18 -07:00
parent 72fe284022
commit 9655c7bf9e
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);
}