wahoo: Switch to two-stage init mounting

* Stop handling vendor mounting from kernel, first stage init is gonna
  do that, together with system (which is now /system)
* Use correct mount flags coming from kernel dts
* Move system and vendor mount points to /dev/block/by-name/, we don't
  have bootdevice symlink to that point in init
* Copy fstab to recovery for first stage init

Change-Id: Iaa0ecc3f13c3cfd3fe357ca509549d0f68a29cf0
This commit is contained in:
Sebastiano Barezz
2023-11-27 14:27:15 +08:00
committed by Asriadi Rahim
parent a63e4c4868
commit cb781488ee
3 changed files with 7 additions and 3 deletions

View File

@@ -58,7 +58,6 @@ TARGET_NO_KERNEL := false
TARGET_NO_RECOVERY := true
TARGET_RECOVERY_DENSITY := xhdpi
BOARD_USES_RECOVERY_AS_BOOT := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_USES_METADATA_PARTITION := true
# Kernel

View File

@@ -665,7 +665,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
$(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
PRODUCT_COPY_FILES += \
device/google/wahoo/fstab.hardware:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.$(PRODUCT_HARDWARE)
device/google/wahoo/fstab.hardware:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.$(PRODUCT_HARDWARE) \
device/google/wahoo/fstab.hardware:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.$(PRODUCT_HARDWARE)
# Use the default charger mode images
PRODUCT_PACKAGES += \

View File

@@ -1,7 +1,11 @@
# Android fstab file.
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
/dev/block/platform/soc/1da4000.ufshc/by-name/system / ext4 ro,barrier=1 wait,slotselect,avb
/dev/block/by-name/system /system ext4 ro,barrier=1 wait,slotselect,avb,first_stage_mount
/dev/block/by-name/vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb,first_stage_mount
/dev/block/by-name/product /product ext4 ro,barrier=1 wait,slotselect,avb,first_stage_mount
/dev/block/by-name/system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb,first_stage_mount
/dev/block/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait
/dev/block/platform/soc/1da4000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,sync wait,formattable
/dev/block/platform/soc/1da4000.ufshc/by-name/userdata /data ext4 errors=panic,noatime,nosuid,nodev,barrier=1,noauto_da_alloc latemount,wait,check,formattable,fileencryption=ice:aes-256-heh,eraseblk=16777216,logicalblk=4096,quota,reservedsize=128M,checkpoint=block
/dev/block/platform/soc/1da4000.ufshc/by-name/misc /misc emmc defaults defaults