From a8a3e4ccf97111fe9ba87176a67daf95d0df84a4 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Wed, 11 Dec 2019 15:14:00 +0800 Subject: [PATCH] Allowing /avb/q-developer-gsi.avbpubkey for DSU Adding the key to allow a device boot a Q-Deverloper-GSI. Bug: 144399552 Test: boots a developer Q-GSI on a Pixel device Change-Id: If79149689afd4b662c4cae3a8b48e3a5dc57d00c Merged-In: I6bc1e068368e64cb0bbf6ef63805444b35a1fdfb --- fs_mgr/fs_mgr_fstab.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 7df7cfd99..1cde70cdc 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp @@ -790,15 +790,16 @@ std::set GetBootDevices() { FstabEntry BuildGsiSystemFstabEntry() { // .logical_partition_name is required to look up AVB Hashtree descriptors. - 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/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey", - .logical_partition_name = "system"}; + 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/q-gsi.avbpubkey:/avb/q-developer-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; system.fs_mgr_flags.first_stage_mount = true;