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

Commit c2452ad8 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

Merge "Update GSI keys for dynamic system image" 

am: 8e5bd5a2

Change-Id: Id3fd51dcba04dc75779cc383b8ce56657b13e0e4
parents 83213346 8e5bd5a2

fs_mgr/fs_mgr_fstab.cpp

+9 −8
Original line number Diff line number Diff line
@@ -754,13 +754,14 @@ std::set<std::string> GetBootDevices() { 


FstabEntry BuildGsiSystemFstabEntry() {

    // .logical_partition_name is required to look up AVB Hashtree descriptors.

    FstabEntry system = {.blk_device = "system_gsi",

    FstabEntry system = {

            .blk_device = "system_gsi",

            .mount_point = "/system",

            .fs_type = "ext4",

            .flags = MS_RDONLY,

            .fs_options = "barrier=1",

            // could add more keys separated by ':'.

                         .avb_keys = "/avb/gsi.avbpubkey:",

            .avb_keys = "/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey",

            .logical_partition_name = "system"};

    system.fs_mgr_flags.wait = true;

    system.fs_mgr_flags.logical = true;