summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattijs Korpershoek <mkorpershoek@baylibre.com>2021-11-06 18:43:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-06 18:43:20 +0000
commit198f666aec91830304c072ce1bea87de1278a8fe (patch)
tree12ec2851197a7ba07390ea86a006bd43455d4726
parent3790470b8a43b900e65b3e464ac4853985a1197e (diff)
parent996ec2d51080fb9bd4e484c24ff113ee6d298350 (diff)
downloadyukawa-198f666aec91830304c072ce1bea87de1278a8fe.tar.gz
yukawa: fstab: remove */block/mmcblk2 entry am: 996ec2d510
Original change: https://googleplex-android-review.googlesource.com/c/device/amlogic/yukawa/+/16184861 Change-Id: Ibdcb413a2d87969f9e8d7532512787c03ccc4e86
-rw-r--r--fstab.yukawa2
-rw-r--r--fstab.yukawa.ab2
-rw-r--r--fstab.yukawa.avb.ab2
3 files changed, 3 insertions, 3 deletions
diff --git a/fstab.yukawa b/fstab.yukawa
index ec54dc3..202dcc8 100644
--- a/fstab.yukawa
+++ b/fstab.yukawa
@@ -4,6 +4,6 @@
/dev/block/platform/soc/ffe07000.mmc/by-name/misc /misc emmc defaults defaults
system /system ext4 ro,barrier=1 wait,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
-*/block/mmcblk* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+*/block/mmcblk[0-1] auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
*/block/sd* auto auto defaults voldmanaged=usb:auto,noemulatedsd
/dev/block/zram0 none swap defaults zramsize=268435456
diff --git a/fstab.yukawa.ab b/fstab.yukawa.ab
index dab466c..25b338f 100644
--- a/fstab.yukawa.ab
+++ b/fstab.yukawa.ab
@@ -3,6 +3,6 @@ vendor /vendor ext4 noatime,ro,errors=panic wait,slotselect,logical,fir
/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev latemount,wait,check,quota,fileencryption=software,quota
/dev/block//by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
/dev/block/by-name/misc /misc emmc defaults defaults
-*/block/mmcblk* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+*/block/mmcblk[0-1] auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
*/block/sd* auto auto defaults voldmanaged=usb:auto,noemulatedsd
/dev/block/zram0 none swap defaults zramsize=268435456
diff --git a/fstab.yukawa.avb.ab b/fstab.yukawa.avb.ab
index 319e915..7399af8 100644
--- a/fstab.yukawa.avb.ab
+++ b/fstab.yukawa.avb.ab
@@ -3,6 +3,6 @@ vendor /vendor ext4 noatime,ro,errors=panic wait,slotselect,avb,logical
/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev latemount,wait,check,quota,fileencryption=software,quota
/dev/block//by-name/userdata /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic latemount,wait,check,quota,formattable,reservedsize=32M
/dev/block/by-name/misc /misc emmc defaults defaults
-*/block/mmcblk* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+*/block/mmcblk[0-1] auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
*/block/sd* auto auto defaults voldmanaged=usb:auto,noemulatedsd
/dev/block/zram0 none swap defaults zramsize=268435456