author | Tellen Yu <tellen.yu@amlogic.com> | 2018-01-29 09:19:13 (GMT) |
---|---|---|
committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2018-01-29 09:19:14 (GMT) |
commit | 966490924b5ac7f6c18faee60cb6482459abf32d (patch) | |
tree | 1bfd342c5cf1f1af4fc0f4d10e2e9f4fe48c7541 | |
parent | 7dccdc912d6ffcfe8b6a1b0bcce15f6cf8fe9a43 (diff) | |
parent | c5a23b96e87c6407803ad427ffc24350c35970ae (diff) | |
download | braun-966490924b5ac7f6c18faee60cb6482459abf32d.zip braun-966490924b5ac7f6c18faee60cb6482459abf32d.tar.gz braun-966490924b5ac7f6c18faee60cb6482459abf32d.tar.bz2 |
Merge "crypto: move encryption method to file based encryption [2/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 |