From 7188462c55e03b36c910e3f86274c41404a97690 Mon Sep 17 00:00:00 2001
From: voodik <voodik.am@gmail.com>
Date: Tue, 14 Apr 2020 12:24:02 +0800
Subject: [PATCH] fix Magisk install on ODROID-N2/C4

 add /dev/block/dtbs support
---
 scripts/magisk_uninstaller.sh | 2 +-
 scripts/util_functions.sh     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/magisk_uninstaller.sh b/scripts/magisk_uninstaller.sh
index e9d0e3d51..b404615a4 100644
--- a/scripts/magisk_uninstaller.sh
+++ b/scripts/magisk_uninstaller.sh
@@ -109,7 +109,7 @@ case $((STATUS & 3)) in
     if [ -d $BACKUPDIR ]; then
       ui_print "- Restoring stock boot image"
       flash_image $BACKUPDIR/boot.img.gz $BOOTIMAGE
-      for name in dtb dtbo; do
+      for name in dtb dtbo dtbs; do
         [ -f $BACKUPDIR/${name}.img.gz ] || continue
         IMAGE=`find_block $name$SLOT`
         [ -z $IMAGE ] && continue
diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh
index 3c3aa7604..2c028ee67 100644
--- a/scripts/util_functions.sh
+++ b/scripts/util_functions.sh
@@ -409,7 +409,7 @@ flash_image() {
 patch_dtb_partitions() {
   local result=1
   cd $MAGISKBIN
-  for name in dtb dtbo; do
+  for name in dtb dtbo dtbs; do
     local IMAGE=`find_block $name$SLOT`
     if [ ! -z $IMAGE ]; then
       ui_print "- $name image: $IMAGE"
@@ -571,7 +571,7 @@ run_migrations() {
 
   # Stock backups
   LOCSHA1=$SHA1
-  for name in boot dtb dtbo; do
+  for name in boot dtb dtbo dtbs; do
     BACKUP=/data/adb/magisk/stock_${name}.img
     [ -f $BACKUP ] || continue
     if [ $name = 'boot' ]; then