Revert "Mount product and system_ext for emulator"
This reverts commit 818e7e94b6cd7f10eab36f0a9c132f4868a3cd98.
The configuration affects GSI to have separate partitions for product
and system_ext which was not intended.
Bug: 138742524
Bug: 138382074
Test: emulator; check boot
diff --git a/fstab.ranchu b/fstab.ranchu
index 9ee0e65..6fafaf5 100644
--- a/fstab.ranchu
+++ b/fstab.ranchu
@@ -2,8 +2,6 @@
#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
system /system ext4 ro,barrier=1 wait,logical,avb=vbmeta,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
-product /product ext4 ro,barrier=1 wait,logical,first_stage_mount
-system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount
/dev/block/vdb /cache ext4 nodev,noatime,nosuid,errors=panic wait
/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,fileencryption=aes-256-xts:aes-256-cts,reservedsize=128M
/dev/block/pci/pci0000:00/0000:00:06.0/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
diff --git a/fstab.ranchu.arm b/fstab.ranchu.arm
index 3173a26..a821e97 100644
--- a/fstab.ranchu.arm
+++ b/fstab.ranchu.arm
@@ -4,7 +4,5 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
system /system ext4 ro,barrier=1 wait,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
-product /product ext4 ro,barrier=1 wait,logical,first_stage_mount
-system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount
/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota
/devices/*/block/vde auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata
diff --git a/fstab.ranchu.initrd b/fstab.ranchu.initrd
index 971d83a..c379960 100644
--- a/fstab.ranchu.initrd
+++ b/fstab.ranchu.initrd
@@ -2,6 +2,4 @@
#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
system /system ext4 ro,barrier=1 wait,logical,avb=vbmeta,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
-product /product ext4 ro,barrier=1 wait,logical,first_stage_mount
-system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount
/dev/block/pci/pci0000:00/0000:00:06.0/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
diff --git a/fstab.ranchu.initrd.arm b/fstab.ranchu.initrd.arm
index b04f812..5605663 100644
--- a/fstab.ranchu.initrd.arm
+++ b/fstab.ranchu.initrd.arm
@@ -2,5 +2,3 @@
#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
system /system ext4 ro,barrier=1 wait,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
-product /product ext4 ro,barrier=1 wait,logical,first_stage_mount
-system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount
diff --git a/fstab.ranchu.initrd.noavb b/fstab.ranchu.initrd.noavb
index 0852714..53da533 100644
--- a/fstab.ranchu.initrd.noavb
+++ b/fstab.ranchu.initrd.noavb
@@ -2,6 +2,4 @@
#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
system /system ext4 ro,barrier=1 wait,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
-product /product ext4 ro,barrier=1 wait,logical,first_stage_mount
-system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount
/dev/block/pci/pci0000:00/0000:00:06.0/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
diff --git a/fstab.ranchu.noavb b/fstab.ranchu.noavb
index 16a04fd..2933f32 100644
--- a/fstab.ranchu.noavb
+++ b/fstab.ranchu.noavb
@@ -2,8 +2,6 @@
#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
system /system ext4 ro,barrier=1 wait,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
-product /product ext4 ro,barrier=1 wait,logical,first_stage_mount
-system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount
/dev/block/vdb /cache ext4 nodev,noatime,nosuid,errors=panic wait
/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,fileencryption=aes-256-xts:aes-256-cts,reservedsize=128M
/dev/block/pci/pci0000:00/0000:00:06.0/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
