From 39eccba58f0e6085f5837728ef489420b925ebca Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 1 Feb 2024 16:04:39 -0800 Subject: [PATCH] Support booting on ext4 for zuma devices When a user opts into 16K developer option, we would need to convert the /data and /metadata partition into ext4. Add necessary fstab entries for ext4 so that zuma devices can boot on ext4. This CL does not automatically switch existing devices to ext4, the newly added fstab entries are intentionally marked as "non-formattable", so that we don't accidentally format a wiped device as ext4. This CL merely allows the device to boot if the /data partition is already formatted as ext4. Test: adb shell cmd recovery wipe ext4 , make sure device boots Bug: 293313353 Change-Id: I3a2a2e9d09cdea884f58b509a06c6829938dc369 --- conf/fstab.zuma.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/fstab.zuma.in b/conf/fstab.zuma.in index bcb0c2f5..903bfe47 100644 --- a/conf/fstab.zuma.in +++ b/conf/fstab.zuma.in @@ -16,7 +16,9 @@ vendor_dlkm /vendor_dlkm /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 /dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount +/dev/block/platform/13200000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,data=journal,commit=1 wait,check,first_stage_mount,metadata_csum #/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount /dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device +/dev/block/platform/13200000.ufs/by-name/userdata /data ext4 noatime,nosuid,nodev,@inlinecrypt@ latemount,wait,check,quota,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption /dev/block/platform/13200000.ufs/by-name/vbmeta /vbmeta emmc defaults slotselect,first_stage_mount /devices/platform/11210000.usb* auto vfat defaults voldmanaged=usb:auto