-none /cache tmpfs nosuid,nodev,noatime defaults
+none /cache tmpfs nosuid,nodev,noatime defaults
-auto /storage/usb0 vfat none wait,noemulatedsd,voldmanaged=usb0:auto
-auto /storage/usb1 vfat none wait,noemulatedsd,voldmanaged=usb1:auto
-auto /storage/usb2 vfat none wait,noemulatedsd,voldmanaged=usb2:auto
-auto /storage/usb3 vfat none wait,noemulatedsd,voldmanaged=usb3:auto
+/devices/*/block/sr* auto auto defaults voldmanaged=cdrom:auto
+/devices/*/usb*/* auto auto defaults voldmanaged=usb:auto,encryptable=userdata
+/devices/*/mmc0:a*/* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/*sdmmc*/* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/80860F14:01/mmc_* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/80860F14:02/mmc_* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/80860F16:00/mmc_* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/PNP0FFF:00/mmc_* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata