fstab: enable adoptable storage [1/1]

PD# 166326

update fstab to enable adoptable storage, according to
https://source.android.com/devices/storage/config-example

Change-Id: I837a730f2ac441fef593457abc01d85e8c69911e

4 files changed, 12 insertions, 16 deletions

diff --git a/fstab.AB.amlogic b/fstab.AB.amlogic
index b4b4b48..c1a642a 100644
--- a/fstab.AB.amlogic
+++ b/fstab.AB.amlogic
@@ -5,10 +5,9 @@
 
 /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,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
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr*  auto             vfat      defaults                       voldmanaged=sr0:auto
+/devices/*.sd/mmc_host/sd*  auto          auto       defaults     voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd*  auto  auto  defaults  voldmanaged=usb:auto,encryptable=userdata
+/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr*  auto  auto  defaults  voldmanaged=sr0:auto,encryptable=userdata
 /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
diff --git a/fstab.AB.verity.amlogic b/fstab.AB.verity.amlogic
index b4b4b48..c1a642a 100644
--- a/fstab.AB.verity.amlogic
+++ b/fstab.AB.verity.amlogic
@@ -5,10 +5,9 @@
 
 /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,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
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr*  auto             vfat      defaults                       voldmanaged=sr0:auto
+/devices/*.sd/mmc_host/sd*  auto          auto       defaults     voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd*  auto  auto  defaults  voldmanaged=usb:auto,encryptable=userdata
+/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr*  auto  auto  defaults  voldmanaged=sr0:auto,encryptable=userdata
 /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
diff --git a/fstab.amlogic b/fstab.amlogic
index 1d9e2ab..8640511 100644
--- a/fstab.amlogic
+++ b/fstab.amlogic
@@ -6,10 +6,9 @@
 /dev/block/misc       /misc               emmc      defaults      defaults
 /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
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd*  auto             vfat      defaults                       voldmanaged=udisk1:auto
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr*  auto             vfat      defaults                       voldmanaged=sr0:auto
+/devices/*.sd/mmc_host/sd*  auto          auto       defaults     voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd*  auto  auto  defaults  voldmanaged=usb:auto,encryptable=userdata
+/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr*  auto  auto  defaults  voldmanaged=sr0:auto,encryptable=userdata
 /dev/block/loop     auto                loop      defaults                                  voldmanaged=loop:auto
 /dev/block/param    /param              ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=remount-ro    wait,check,formattable
 # Add for zram. zramsize can be in numeric (byte) , in percent
diff --git a/fstab.verity.amlogic b/fstab.verity.amlogic
index 1d9e2ab..8640511 100644
--- a/fstab.verity.amlogic
+++ b/fstab.verity.amlogic
@@ -6,10 +6,9 @@
 /dev/block/misc       /misc               emmc      defaults      defaults
 /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
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd*  auto             vfat      defaults                       voldmanaged=udisk1:auto
-/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr*  auto             vfat      defaults                       voldmanaged=sr0:auto
+/devices/*.sd/mmc_host/sd*  auto          auto       defaults     voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd*  auto  auto  defaults  voldmanaged=usb:auto,encryptable=userdata
+/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr*  auto  auto  defaults  voldmanaged=sr0:auto,encryptable=userdata
 /dev/block/loop     auto                loop      defaults                                  voldmanaged=loop:auto
 /dev/block/param    /param              ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=remount-ro    wait,check,formattable
 # Add for zram. zramsize can be in numeric (byte) , in percent