From a909d7b4279d1c4c2d204335fabdee7df1970414 Mon Sep 17 00:00:00 2001 From: Albert I Date: Fri, 2 Jul 2021 20:08:12 +0800 Subject: [PATCH] sm7250-common: fstab: Handle `avb=` fs_mgr flags correctly Specifying avb= is only necessary for first entry of partition groups that use same vbmeta partition. The following entry can have part omitted. Test: None Link: https://source.android.com/devices/architecture/kernel/mounting-partitions-early#fstab-entries Signed-off-by: Albert I Change-Id: I5a42fd3de72c400acfae56d6a1e1b85c22a79537 --- rootdir/etc/fstab.default | 8 ++++---- rootdir/etc/fstab.emmc | 8 ++++---- rootdir/etc/recovery.fstab | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rootdir/etc/fstab.default b/rootdir/etc/fstab.default index 8aaeb41..908541c 100644 --- a/rootdir/etc/fstab.default +++ b/rootdir/etc/fstab.default @@ -30,10 +30,10 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # -system /system ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey -system_ext /system_ext ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount -product /product ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount -vendor /vendor ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount +system /system ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey +system_ext /system_ext ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount +product /product ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount +vendor /vendor ext4 ro,barrier=1,discard wait,avb=vbmeta,logical,first_stage_mount odm /odm ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,noatime,nodev,barrier=1 wait diff --git a/rootdir/etc/fstab.emmc b/rootdir/etc/fstab.emmc index 7c43cac..b07874e 100644 --- a/rootdir/etc/fstab.emmc +++ b/rootdir/etc/fstab.emmc @@ -30,10 +30,10 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # -system /system ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey -system_ext /system_ext ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount -product /product ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount -vendor /vendor ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount +system /system ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey +system_ext /system_ext ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount +product /product ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount +vendor /vendor ext4 ro,barrier=1,discard wait,avb=vbmeta,logical,first_stage_mount odm /odm ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,noatime,nodev,barrier=1 wait diff --git a/rootdir/etc/recovery.fstab b/rootdir/etc/recovery.fstab index 02f4803..e6113a6 100644 --- a/rootdir/etc/recovery.fstab +++ b/rootdir/etc/recovery.fstab @@ -29,11 +29,11 @@ #device mount point fstype [device2] [length=] -system /system ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount -system_ext /system_ext ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount +system /system ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount +system_ext /system_ext ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount vendor /vendor ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount odm /odm ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount -product /product ext4 ro,barrier=1,discard wait,avb=vbmeta_system,logical,first_stage_mount +product /product ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount /dev/block/bootdevice/by-name/cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check /dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,formattable,encryptable=footer,quota,reservedsize=128M,checkpoint=fs