summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2019-01-09 11:09:34 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-09 11:09:34 -0800
commitbd3cfe3fe1a56c63524fd6d11885970990339668 (patch)
treebe1df4b260e495e6827905cf649635caf7bf6461
parent3b18d74935e32ea23b7265fd88f3f182d481eab5 (diff)
parent7eae48d3b2ab62b5ad1f08fb80f7b6808190cf1c (diff)
downloadhikey-bd3cfe3fe1a56c63524fd6d11885970990339668.tar.gz
fstab.hikey: mount data with nosuid and nodev am: ad6612fc91
am: 7eae48d3b2 Change-Id: I20959c198b5f37e648bcb6c5c5f2adf10cabe905
-rw-r--r--hikey/fstab.hikey2
-rw-r--r--hikey960/fstab.hikey9602
2 files changed, 2 insertions, 2 deletions
diff --git a/hikey/fstab.hikey b/hikey/fstab.hikey
index ef04e325..2a5cd3cb 100644
--- a/hikey/fstab.hikey
+++ b/hikey/fstab.hikey
@@ -4,6 +4,6 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
/dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata /data f2fs discard,noatime,nosuid,nodev wait,check,fileencryption=software,quota
-/dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata /data ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata /data ext4 discard,noatime,noauto_da_alloc,nosuid,nodev,data=ordered,user_xattr,barrier=1 wait,formattable
/devices/platform/soc/f723e000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
/devices/platform/soc/f72c0000.usb/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata
diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960
index 9229c486..2bb2bbe8 100644
--- a/hikey960/fstab.hikey960
+++ b/hikey960/fstab.hikey960
@@ -7,7 +7,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/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,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable
+/dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable
/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