From c09149f86b569ae47421631a7a3d3d880ef1bb50 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
Date: Fri, 8 Jun 2018 19:13:08 +0200
Subject: [PATCH] fixSPL: More robust partition matching

OP6 has a partition called boot_aging. It would get matched instead of
boot_a when on slot A
---
 rw-system.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rw-system.sh b/rw-system.sh
index 86dc044..61076cc 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -8,8 +8,8 @@ fixSPL() {
     else
 	    setprop ro.keymaster.mod 'AOSP on ARM64'
     fi
-    img="$(find /dev/block -type l |grep by-name |grep /kernel$(getprop ro.boot.slot_suffix) |head -n 1)"
-    [ -z "$img" ] && img="$(find /dev/block -type l |grep by-name |grep /boot$(getprop ro.boot.slot_suffix) |head -n 1)"
+    img="$(find /dev/block -type l -name kernel$(getprop ro.boot.slot_suffix) |grep by-name |head -n 1)"
+    [ -z "$img" ] && img="$(find /dev/block -type l -name boot$(getprop ro.boot.slot_suffix) |grep by-name |head -n 1)"
     if [ -n "$img" ];then
         #Rewrite SPL/Android version if needed
         Arelease="$(getSPL $img android)"