author | Tellen Yu <tellen.yu@amlogic.com> | 2018-01-29 09:19:06 (GMT) |
---|---|---|
committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2018-01-29 09:19:06 (GMT) |
commit | 3a4c0d3e6d96b4095d3a7de3ea9b55dd2d30a30e (patch) | |
tree | 6621fd544891c9cb68f4dd219857708b7d113efc | |
parent | 56a39dfd3ab1db89ee4d5806ec7be1c0f35eb165 (diff) | |
parent | 00c2e06bccdde39e45d624e6b1dff27992e4893c (diff) | |
download | ampere-3a4c0d3e6d96b4095d3a7de3ea9b55dd2d30a30e.zip ampere-3a4c0d3e6d96b4095d3a7de3ea9b55dd2d30a30e.tar.gz ampere-3a4c0d3e6d96b4095d3a7de3ea9b55dd2d30a30e.tar.bz2 |
Merge "crypto: move encryption method to file based encryption [1/4]" into o-ref-amlogic
-rw-r--r-- | fstab.AB.amlogic | 4 | ||||
-rw-r--r-- | fstab.AB.verity.amlogic | 4 | ||||
-rw-r--r-- | fstab.amlogic | 4 | ||||
-rw-r--r-- | fstab.verity.amlogic | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/fstab.AB.amlogic b/fstab.AB.amlogic index 5208ca2..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 @@ -12,4 +12,4 @@ /dev/block/loop auto loop defaults voldmanaged=loop:auto # Add for zram. zramsize can be in numeric (byte) , in percent /dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
\ No newline at end of file +/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/fstab.AB.verity.amlogic b/fstab.AB.verity.amlogic index 5208ca2..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 @@ -12,4 +12,4 @@ /dev/block/loop auto loop defaults voldmanaged=loop:auto # Add for zram. zramsize can be in numeric (byte) , in percent /dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
\ No newline at end of file +/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/fstab.amlogic b/fstab.amlogic index 01d6aae..c862886 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 @@ -13,4 +13,4 @@ /dev/block/loop auto loop defaults voldmanaged=loop:auto # Add for zram. zramsize can be in numeric (byte) , in percent /dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
\ No newline at end of file +/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/fstab.verity.amlogic b/fstab.verity.amlogic index 01d6aae..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 @@ -13,4 +13,4 @@ /dev/block/loop auto loop defaults voldmanaged=loop:auto # Add for zram. zramsize can be in numeric (byte) , in percent /dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
\ No newline at end of file +/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable |