diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-28 16:41:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-28 16:41:01 +0000 |
| commit | 36575c0f4f36a47d979d117b3388a806c5ea2d7d (patch) | |
| tree | ecbebb34a99571711d6ae4a911496a8f9e42adb6 /shared | |
| parent | 7a5e183983b8e4a53a14902fa76eae027aa5c021 (diff) | |
| parent | fc1afdafa1582f61bdf8c61c9d8facf71f12be1b (diff) | |
| download | cuttlefish-36575c0f4f36a47d979d117b3388a806c5ea2d7d.tar.gz | |
Merge "Allow cuttlefish to boot on ext4 images even if f2fs mode specified" into main am: fc1afdafa1
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2965762
Change-Id: I9f592e0914b4cac46bece4067806acd9bd1be5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'shared')
| -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 |