diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-06-22 18:56:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-22 18:56:23 +0000 |
| commit | cc82fd9795a7517b114d54980cb176f1183dbc64 (patch) | |
| tree | 64046005eaba4aee9b666972c0731af3df3a9a2c | |
| parent | c37f55401e2deca7cb1071cbc87a528b91460793 (diff) | |
| parent | 5d007783f550917394a7aa67e5894754b175c845 (diff) | |
| download | hikey-android-s-beta-4.tar.gz | |
Merge changes I63a8ceda,Ibc34b74aandroid-s-beta-4android-s-beta-3android-s-beta-4
* changes:
hikey960: fstab.hikey960: Set metadata as first_stage_mount to resolve adb remount overlay persistence issues
hikey960: fstab.hikey960: Drop f2fs userdata
| -rw-r--r-- | hikey960/fstab.hikey960 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index 63326f60..58913231 100644 --- a/hikey960/fstab.hikey960 +++ b/hikey960/fstab.hikey960 @@ -6,9 +6,8 @@ #/dev/block/platform/soc/ff3b0000.ufs/by-name/system_a /system ext4 ro wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait -/dev/block/by-name/userdata /data f2fs discard,noatime,nosuid,nodev wait,check,fileencryption=software,quota /dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,quota -/dev/block/by-name/cache /metadata ext4 noatime,nosuid,nodev,discard wait,formattable +/dev/block/by-name/cache /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount,check /devices/platform/soc/ff37f000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata /devices/platform/soc/ff200000.hisi_usb/ff100000.dwc3/xhci-hcd.*.auto/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata /devices/platform/soc/f4000000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/nvme/nvme* auto auto defaults voldmanaged=nvmedisk:auto,encryptable=userdata |