commit a8a3e4ccf97111fe9ba87176a67daf95d0df84a4
author Bowgo Tsai <bowgotsai@google.com> Wed Dec 11 15:14:00 2019 +0800
committer Bowgo Tsai <bowgotsai@google.com> Mon Dec 16 14:51:22 2019 +0800
tree 69ecf8abb17aa368964512932013bca002cefbb9
parent d1bdcba6253362d69aa548a09b30511c30a3f417

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

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 7df7cfd..1cde70c 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -790,15 +790,16 @@
 
 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;