author | Xindong Xu <xindong.xu@amlogic.com> | 2018-05-14 01:48:49 (GMT) |
---|---|---|
committer | Gerrit Code Review <gituser@droid04> | 2018-05-14 01:48:49 (GMT) |
commit | 21fed32a6d69a8de7a22f2e62637370a9b4a35b0 (patch) | |
tree | 65e7f58a9d86121aab38c89dead6a7ef3de1c8dc | |
parent | 9e44c106c80a02dc985094197faf019e05860058 (diff) | |
parent | 66609407c3f0e7373b3cc58f8dfabbc9b3ccb10f (diff) | |
download | darwin-21fed32a6d69a8de7a22f2e62637370a9b4a35b0.zip darwin-21fed32a6d69a8de7a22f2e62637370a9b4a35b0.tar.gz darwin-21fed32a6d69a8de7a22f2e62637370a9b4a35b0.tar.bz2 |
Merge "fstab: change FDE to FBE on Android P [1/1]" into p-amlogic
-rw-r--r-- | fstab.AB.amlogic | 2 | ||||
-rw-r--r-- | fstab.AB.verity.amlogic | 2 | ||||
-rw-r--r-- | fstab.amlogic | 2 | ||||
-rw-r--r-- | fstab.verity.amlogic | 2 |
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 70445eb..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,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.amlogic b/fstab.amlogic index 9ed5ccc..1d9e2ab 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-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 diff --git a/fstab.verity.amlogic b/fstab.verity.amlogic index 9ed5ccc..1d9e2ab 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 |