summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-05-08 07:07:22 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-05-10 05:35:20 (GMT)
commit5bc23ec41aaa21ca4c282707dabebfcfb5886bfc (patch)
treeeaeebb395ee4406bed2225bb34e0e37df4efb776
parente9e4e29b879c9fb3d4d30ea7b2e15f2cc2e117aa (diff)
downloadbraun-5bc23ec41aaa21ca4c282707dabebfcfb5886bfc.zip
braun-5bc23ec41aaa21ca4c282707dabebfcfb5886bfc.tar.gz
braun-5bc23ec41aaa21ca4c282707dabebfcfb5886bfc.tar.bz2
fstab: change FDE to FBE on Android P [1/1]
PD# 158397 change FDE to FBE on Android P Change-Id: Ib9c35ded1b522cb54346f286e677f2de65475d85
Diffstat
-rw-r--r--fstab.AB.amlogic2
-rw-r--r--fstab.AB.verity.amlogic2
-rw-r--r--fstab.amlogic2
-rw-r--r--fstab.verity.amlogic2
4 files changed, 4 insertions, 4 deletions
diff --git a/fstab.AB.amlogic b/fstab.AB.amlogic
index 70445eb..b4b4b48 100644
--- a/fstab.AB.amlogic
+++ b/fstab.AB.amlogic
@@ -4,7 +4,7 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
/dev/block/platform/d0074000.emmc/misc /misc emmc defaults defaults
-/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,quota,formattable
+/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable
/devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd
/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto
/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk1:auto
diff --git a/fstab.AB.verity.amlogic b/fstab.AB.verity.amlogic
index 722dec3..b4b4b48 100644
--- a/fstab.AB.verity.amlogic
+++ b/fstab.AB.verity.amlogic
@@ -4,7 +4,7 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
/dev/block/platform/d0074000.emmc/misc /misc emmc defaults defaults
-/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptiable=footer,quota,formattable
+/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable
/devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd
/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto
/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk1:auto
diff --git a/fstab.amlogic b/fstab.amlogic
index 9bb9380..3b7ca85 100644
--- a/fstab.amlogic
+++ b/fstab.amlogic
@@ -4,7 +4,7 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
/dev/block/misc /misc emmc defaults defaults
-/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,quota,formattable
+/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xtsr,quota,formattable
/dev/block/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
/devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd
/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto
diff --git a/fstab.verity.amlogic b/fstab.verity.amlogic
index 9bb9380..c862886 100644
--- a/fstab.verity.amlogic
+++ b/fstab.verity.amlogic
@@ -4,7 +4,7 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
/dev/block/misc /misc emmc defaults defaults
-/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,quota,formattable
+/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable
/dev/block/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
/devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd
/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto