From b832cc86c71d969dd7f21d9b10b203eb67b1b8cd Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 18 Oct 2023 13:31:23 -0700 Subject: [PATCH] fstab: allow unlocked devices to boot with AVB test key Set `avb_keys=no_such_key` for dynamic kernel partitions to allow booting unlocked devices with a custom kernel. This allows a few things: 1) Dogfooders can flash a custom kernel without wiping their device. This can help developers track down hard-to-reproduce bugs without rolling out a patch to the whole dogfooder population. 2) Developers can uprev their device's kernel without wiping their device or packaging the kernel with an Android platform build. Note: we are using "no_such_key" to ensure an AVB keys file doesn't accidentally get created. Test: Flash CI build. Then flash custom kernel on top. Bug: 274825778 Change-Id: Ibf3cee491404b9efc18c49936edf64c2e3084adf --- conf/fstab.zuma.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/fstab.zuma.in b/conf/fstab.zuma.in index e7491623..182b3b9c 100644 --- a/conf/fstab.zuma.in +++ b/conf/fstab.zuma.in @@ -7,11 +7,11 @@ system /system ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 # During compliance testing, the previous line would fail (because GSI is ext4), and the next line would be used to mount GSI. system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_dlkm /system_dlkm ext4 ro wait,slotselect,avb=vbmeta_system,avb_keys=no_such_key,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor ext4 ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 -vendor_dlkm /vendor_dlkm ext4 ro wait,slotselect,avb=vbmeta,logical,first_stage_mount +vendor_dlkm /vendor_dlkm ext4 ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount /dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable