From ece41241bcf3a17d9c85dada465ed0eecd58c561 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Mon, 5 Aug 2024 14:16:05 -0700 Subject: [PATCH] Move the system read only partitions to fstab.ro.system The system/vendor/product read only partitions will be moved to fstab.ro.system file to easily identify them in the future. Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: I0402df991160e1fabdfdc5d4e4482320f671ae09 --- conf/Android.bp | 4 +++- conf/fstab.ro.system | 14 ++++++++++++++ conf/fstab.zumapro.common | 11 ----------- 3 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 conf/fstab.ro.system diff --git a/conf/Android.bp b/conf/Android.bp index 0185c98..4741102 100644 --- a/conf/Android.bp +++ b/conf/Android.bp @@ -25,6 +25,8 @@ package { filegroup { name: "fstab.zumapro.common", - srcs: ["fstab.zumapro.common"], + srcs: ["fstab.ro.system", + "fstab.zumapro.common" + ], } diff --git a/conf/fstab.ro.system b/conf/fstab.ro.system new file mode 100644 index 0000000..989604b --- /dev/null +++ b/conf/fstab.ro.system @@ -0,0 +1,14 @@ +# Android fstab file for system/vendor/product partitions +# +# The filesystem that contains the filesystem checker binary (typically /system) cannot +# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK +# +# +system /system ext4 noatime,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 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=no_such_key,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=no_such_key,logical,first_stage_mount diff --git a/conf/fstab.zumapro.common b/conf/fstab.zumapro.common index a5521b7..961cac6 100644 --- a/conf/fstab.zumapro.common +++ b/conf/fstab.zumapro.common @@ -1,17 +1,6 @@ # Android fstab file. # -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -# # -system /system ext4 noatime,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 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=no_such_key,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=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/misc /misc emmc defaults wait