From 362b70d84dca8848ac96353fded7ea6d7eb3bec8 Mon Sep 17 00:00:00 2001 From: Nicholas Andrew Date: Sat, 18 Jul 2026 20:55:09 -0400 Subject: [PATCH] rtwo: fix logical partition mounts and recovery signing --- BoardConfig.mk | 6 ------ recovery/root/system/etc/recovery.fstab | 21 +++++++-------------- twrp_rtwo.mk | 3 +++ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 698c8a9..20cef55 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -198,9 +198,3 @@ TW_CUSTOM_CLOCK_POS := 50 TW_CUSTOM_BATTERY_POS := 800 TW_HAS_EDL_MODE := true # End* - -# A-Team Private Signing - Added by signKEYS -# We use ?= to bypass readonly restrictions in some trees -PRODUCT_DEFAULT_DEV_CERTIFICATE ?= vendor/ateam/releasekey -PRODUCT_OTA_PUBLIC_KEYS ?= vendor/ateam/releasekey.x509.pem -PRODUCT_EXTRA_RECOVERY_KEYS ?= vendor/ateam/releasekey diff --git a/recovery/root/system/etc/recovery.fstab b/recovery/root/system/etc/recovery.fstab index c59b90b..e9cccf5 100644 --- a/recovery/root/system/etc/recovery.fstab +++ b/recovery/root/system/etc/recovery.fstab @@ -35,20 +35,13 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # -/dev/block/mapper/system /system_root erofs ro wait,first_stage_mount -/dev/block/mapper/system /system_root f2fs ro wait,first_stage_mount -/dev/block/mapper/system /system_root ext4 ro wait,first_stage_mount -/dev/block/mapper/vendor /vendor erofs ro wait,first_stage_mount -/dev/block/mapper/vendor /vendor ext4 ro wait,first_stage_mount -/dev/block/mapper/system_ext /system_ext erofs ro wait,first_stage_mount -/dev/block/mapper/system_ext /system_ext ext4 ro wait,first_stage_mount -/dev/block/mapper/vendor_dlkm /vendor_dlkm erofs ro wait,first_stage_mount -/dev/block/mapper/vendor_dlkm /vendor_dlkm ext4 ro wait,first_stage_mount -/dev/block/mapper/product /product erofs ro wait,first_stage_mount -/dev/block/mapper/product /product ext4 ro wait,first_stage_mount -/dev/block/mapper/system_dlkm /system_dlkm erofs ro wait,first_stage_mount -/dev/block/mapper/system_dlkm /system_dlkm ext4 ro wait,first_stage_mount +/dev/block/mapper/system /system_root erofs ro wait,first_stage_mount,logical,slotselect +/dev/block/mapper/vendor /vendor erofs ro wait,first_stage_mount,logical,slotselect +/dev/block/mapper/system_ext /system_ext erofs ro wait,first_stage_mount,logical,slotselect +/dev/block/mapper/vendor_dlkm /vendor_dlkm erofs ro wait,first_stage_mount,logical,slotselect +/dev/block/mapper/product /product erofs ro wait,first_stage_mount,logical,slotselect +/dev/block/mapper/system_dlkm /system_dlkm erofs ro wait,first_stage_mount,logical,slotselect /dev/block/by-name/metadata /metadata f2fs noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678,whint_mode=fs-based,inlinecrypt latemount,wait,check,,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs,fscompress,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,whint_mode=fs-based,inlinecrypt latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults,first_stage_mount diff --git a/twrp_rtwo.mk b/twrp_rtwo.mk index d26c091..0780f21 100644 --- a/twrp_rtwo.mk +++ b/twrp_rtwo.mk @@ -30,3 +30,6 @@ PRODUCT_MANUFACTURER := motorola # Virtual A/B OTA support $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) + +# A-Team signing configuration +$(call inherit-product, vendor/ateam/android.mk)