summaryrefslogtreecommitdiff
authorTing Li <ting.li@amlogic.com>2018-04-13 10:12:27 (GMT)
committer Ting Li <ting.li@amlogic.com>2018-04-13 10:33:56 (GMT)
commit509bae223956e195af054cfe6bf9ee8b89acfa14 (patch)
treec2c046c4ed5f8549d665b0bc095406fb8e9b64ce
parent0df7d5777f87dd1147ab5d039c4b72336fc1c7bf (diff)
downloadeinstein-509bae223956e195af054cfe6bf9ee8b89acfa14.zip
einstein-509bae223956e195af054cfe6bf9ee8b89acfa14.tar.gz
einstein-509bae223956e195af054cfe6bf9ee8b89acfa14.tar.bz2
FDE: use dynamic fde instand of enforceencrypt[5/7]
PD# NONE use dynamic fde instand of enforceencrypt Change-Id: I1bc920f373ff646a7f9c938d63dc2709b4ae5482
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 ff9f134..70445eb 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,forceencrypt=footer,quota,formattable
+/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,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 ff9f134..70445eb 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,forceencrypt=footer,quota,formattable
+/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,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 3afd86b..9ed5ccc 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,forceencrypt=footer,quota,formattable
+/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,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 3afd86b..9ed5ccc 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,forceencrypt=footer,quota,formattable
+/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,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