commit 9a96ef189ad1bbedd9c1164f87a29ad59df7b91b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 23 01:30:14 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 23 01:30:14 2018 +0000
tree 50ba47d3d4b9a1ccddecdc39ce85c83d5a984548
parent d6127320d1d5e5db69f60265fa93049f809bcb3f
parent 5bdf7a6221c4e2446f1f73ebbfa251e52a75838e

Merge "hikey960: Allow userdata f2fs mount"

hikey960/fstab.hikey960

diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960
index 0cb7c5f..e456dac 100644
--- a/hikey960/fstab.hikey960
+++ b/hikey960/fstab.hikey960
@@ -8,6 +8,7 @@
 #/dev/block/platform/soc/ff3b0000.ufs/by-name/cache       /cache     ext4    discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
 /dev/block/sdd5     /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/sdd13    /data      f2fs    discard,noatime,nosuid,nodev                                 wait,check,fileencryption=software,quota
 /dev/block/sdd13    /data      ext4    discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
 /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