summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam McVicker <willmcvicker@google.com>2023-10-19 17:02:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-10-19 17:02:25 +0000
commitc88501a60669b0e7deba8fb1d1d868803b22622f (patch)
treebac9d29ccde7d8334a333631efa639bd1f39a9e2
parentc13cd03ccf360755bcebaa0df94427a3ac81217e (diff)
downloadgs201-c88501a60669b0e7deba8fb1d1d868803b22622f.tar.gz
Revert "fstab: allow unlocked devices to boot with AVB test key"
This reverts commit c13cd03ccf360755bcebaa0df94427a3ac81217e. Reason for revert: Let's go through a proper security review for this. Bug: 306264015 Change-Id: I51fe3f32f8a4ec92cb2d38869568a51dc2522bb4
-rw-r--r--conf/fstab.gs201.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in
index 88a1712..e1af3e8 100644
--- a/conf/fstab.gs201.in
+++ b/conf/fstab.gs201.in
@@ -5,11 +5,11 @@
#
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
system /system ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
-system_dlkm /system_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta_system,avb_keys=/avb,logical,first_stage_mount,readahead_size_kb=128
+system_dlkm /system_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
system_ext /system_ext ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
product /product ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
vendor /vendor ext4 noatime,ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
-vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=/avb,logical,first_stage_mount
+vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,logical,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/misc /misc emmc defaults wait