Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9655c7bf authored by David Anderson's avatar David Anderson
Browse files

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

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
parent 72fe2840

fs_mgr/fs_mgr_fstab.cpp

+5 −2
Original line number Diff line number Diff line
@@ -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);

    }