| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-03-28 10:53:03 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-03-28 10:53:03 (GMT) |
| commit | 29c28a34388bf9d41762d2f3bc78031e57b81cd7 (patch) | |
| tree | ad6d91d15589527636978c59a65c19d127f4af94 | |
| parent | bcfe6bee134687022f6000dce583c5a6eb39a95a (diff) | |
| parent | f4fff7738a5b3521e14eb74bc7a0dc58e62aeac3 (diff) | |
| download | einstein-29c28a34388bf9d41762d2f3bc78031e57b81cd7.zip einstein-29c28a34388bf9d41762d2f3bc78031e57b81cd7.tar.gz einstein-29c28a34388bf9d41762d2f3bc78031e57b81cd7.tar.bz2 | |
Merge "einstein: sync fstab.AB.amlogic to fstab.amlogic [1/1]" into o-amlogic
| -rw-r--r-- | fstab.AB.amlogic | 2 | ||||
| -rw-r--r-- | fstab.AB.verity.amlogic | 2 | ||||
| -rw-r--r-- | fstab.verity.amlogic | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fstab.AB.amlogic b/fstab.AB.amlogic index 70445eb..ff9f134 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,forceencrypt=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 70445eb..ff9f134 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,forceencrypt=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.verity.amlogic b/fstab.verity.amlogic index 9ed5ccc..3afd86b 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,forceencrypt=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 |