diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2024-02-15 09:33:40 -0800 |
|---|---|---|
| committer | Pawan Wagh <waghpawan@google.com> | 2024-02-20 21:58:48 +0000 |
| commit | 5a4e7e9d526220371431c8cdaffe088d1b1c986b (patch) | |
| tree | 6ffc507c7f16e3c7af16b462ff119b34bb474b20 | |
| parent | dead01d78e0251b21f5e1a02e13c6002ab493065 (diff) | |
| download | cuttlefish-5a4e7e9d526220371431c8cdaffe088d1b1c986b.tar.gz | |
Allow cuttlefish to boot on ext4 images even if f2fs mode specified
There's an userspace API to wipe /data partition and reformat as EXT4.
This API is used to implement the 16K dev options feature. Since the
device's data partition might be reformatted w/o re-running launch_cvd
with a different --userdata_format flag, add ext4 fstab entries so that
device can always boot.
Test: th
Bug: 293313353
Change-Id: I6f7cbddfd12f902a6c12784ece83f162f318e26a
| -rw-r--r-- | shared/config/fstab.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shared/config/fstab.in b/shared/config/fstab.in index 0f7cc74c0..2ee4f8c0c 100644 --- a/shared/config/fstab.in +++ b/shared/config/fstab.in @@ -6,7 +6,9 @@ system /system erofs ro wait,logical,first_stage_mount,slotselect,avb=vbmeta_sys system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb=vbmeta_system,avb_keys=/avb # Add all non-dynamic partitions except system, after this comment /dev/block/by-name/userdata /data @userdata_fs_type@ nodev,noatime,nosuid,@userdata_mount_flags@ latemount,wait,check,quota,formattable,keydirectory=/metadata/vold/metadata_encryption,@userdata_fsmgr_flags@ +/dev/block/by-name/userdata /data ext4 nodev,noatime,nosuid,errors=panic latemount,wait,check,quota,keydirectory=/metadata/vold/metadata_encryption,@userdata_fsmgr_flags@ /dev/block/by-name/metadata /metadata @metadata_fs_type@ nodev,noatime,nosuid wait,check,formattable,first_stage_mount +/dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid wait,check,first_stage_mount /dev/block/by-name/misc /misc emmc defaults defaults # Add all dynamic partitions except system, after this comment odm /odm erofs ro wait,logical,first_stage_mount,slotselect,avb |