From 8588147d67ffbae4a7fcfe5fac1c1acc17e557e6 Mon Sep 17 00:00:00 2001 From: osm0sis Date: Wed, 5 Apr 2023 23:19:05 -0300 Subject: [PATCH] Backend: fix byname finding on modern Android versions for devices without super - /dev/block/mapper exists on all devices with apex but only contains system partition symlinks on devices with super partition logical partitions --- META-INF/com/google/android/update-binary | 2 +- META-INF/com/google/android/updater-script | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary index fa8bd92..f511d5f 100755 --- a/META-INF/com/google/android/update-binary +++ b/META-INF/com/google/android/update-binary @@ -131,7 +131,7 @@ mount_all() { fi; byname=bootdevice/by-name; [ -d /dev/block/$byname ] || byname=$($BB find /dev/block/platform -type d -name by-name 2>/dev/null | $BB head -n1 | $BB cut -d/ -f4-); - [ -d /dev/block/mapper ] && byname=mapper; + [ -e /dev/block/$byname/super ] && [ -d /dev/block/mapper ] && byname=mapper; [ -e /dev/block/$byname/system ] || slot=$(find_slot); case $ANDROID_ROOT in /system_root) setup_mountpoint /system;; diff --git a/META-INF/com/google/android/updater-script b/META-INF/com/google/android/updater-script index b17d76c..32eed36 100644 --- a/META-INF/com/google/android/updater-script +++ b/META-INF/com/google/android/updater-script @@ -3,4 +3,4 @@ # Dummy file; update-binary is a shell script (DO NOT CHANGE) # # -# AK_BASE_VERSION=20230323 +# AK_BASE_VERSION=20230405