summaryrefslogtreecommitdiff
path: root/hikey960
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2021-06-04 23:37:31 +0000
committerJohn Stultz <john.stultz@linaro.org>2021-06-04 23:54:06 +0000
commitc71cd79888d415d3d25930ab7566bd7df5d57f1c (patch)
tree30dd426d4e31fcb082ac5201008ad7d5ffcb6782 /hikey960
parent38d4c1e6fd20a1e21c7066fd8cac02af722f57b5 (diff)
downloadhikey-c71cd79888d415d3d25930ab7566bd7df5d57f1c.tar.gz
hikey960: fstab.hikey960: Drop f2fs userdata
Over the last week I started seeing some occasional trouble with the f2fs entry in fstab.hikey960 causing init confusion where the fsck found bad magic value (since the partition is ext4), but the partition wasn't released before the ext4 mount began and saw it as in use. This caused userdata not not be mounted at all, and resulted in a number of keystore errors and the system not booting fully to UI. I don't think anyone is really using the f2fs userdata config with HiKey960, so lets drop it. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Ibc34b74a252fd94618fb454db4b9c46ec9eef1a5
Diffstat (limited to 'hikey960')
-rw-r--r--hikey960/fstab.hikey9601
1 files changed, 0 insertions, 1 deletions
diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960
index 63326f60..fe43486b 100644
--- a/hikey960/fstab.hikey960
+++ b/hikey960/fstab.hikey960
@@ -6,7 +6,6 @@
#/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
/devices/platform/soc/ff37f000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata