From f88f90e3d2f48924256e9f6cc66819a14afed2bf Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Wed, 15 Sep 2021 00:02:22 -0300
Subject: [PATCH] Backend: underps and regression fixes

- fallback by-name system mount may still result in /system at /system_root so add back check
- add missing /persist mountpoint
---
 META-INF/com/google/android/update-binary  | 7 ++++---
 META-INF/com/google/android/updater-script | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
index 789afdb..c6d790f 100755
--- a/META-INF/com/google/android/update-binary
+++ b/META-INF/com/google/android/update-binary
@@ -144,19 +144,20 @@ mount_all() {
       fi;
     ;;
   esac;
+  [ -f /system_root/system/build.prop ] && system=/system;
   for mount in /vendor /product /system_ext; do
-    if ! is_mounted $mount && [ -L /system$mount -o -L /system_root$mount ]; then
+    if ! is_mounted $mount && [ -L /system$mount -o -L /system_root$system$mount ]; then
       setup_mountpoint $mount;
       $BB mount -o ro -t auto /dev/block/$byname$mount$slot $mount;
     fi;
   done;
   if is_mounted /system_root; then
     mount_apex;
-    $BB mount -o bind /system_root /system;
+    $BB mount -o bind /system_root$system /system;
   fi;
   if ! is_mounted /persist && [ -e /dev/block/bootdevice/by-name/persist ]; then
     setup_mountpoint /persist;
-    $BB mount -o ro -t auto /dev/block/bootdevice/by-name/persist;
+    $BB mount -o ro -t auto /dev/block/bootdevice/by-name/persist /persist;
   fi;
 }
 umount_all() {
diff --git a/META-INF/com/google/android/updater-script b/META-INF/com/google/android/updater-script
index d9b1856..e140e9e 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=20210914
+# AK_BASE_VERSION=20210915