From 3269b51d28be3f2257f275ff8842e2b48ccd4b36 Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Wed, 29 Nov 2017 13:34:51 -0400
Subject: [PATCH] AK2: add dtbo and Pixel 2 slot prop support - dtbo may be
 added as dtbo or dtbo.img to the base of the zip - new Pixel 2 ro.boot.slot
 doesn't contain _ like Pixel ro.boot.slot_suffix does

Thanks @nathanchance for the majority of the work and research on this one, via #12
---
 tools/ak2-core.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tools/ak2-core.sh b/tools/ak2-core.sh
index 8a7400b..7bad8dc 100755
--- a/tools/ak2-core.sh
+++ b/tools/ak2-core.sh
@@ -268,6 +268,25 @@ write_boot() {
     dd if=/dev/zero of=$block 2>/dev/null;
     dd if=/tmp/anykernel/boot-new.img of=$block;
   fi;
+  for i in dtbo dtbo.img; do
+    if [ -f /tmp/anykernel/$i ]; then
+      dtbo=$i;
+      break;
+    fi;
+  done;
+  if [ "$dtbo" ]; then
+    dtbo_block=/dev/block/bootdevice/by-name/dtbo$slot;
+    if [ ! -e "$(echo $dtbo_block)" ]; then
+      ui_print " "; ui_print "dtbo partition could not be found. Aborting..."; exit 1;
+    fi;
+    if [ -f "$bin/flash_erase" -a -f "$bin/nandwrite" ]; then
+      $bin/flash_erase $dtbo_block 0 0;
+      $bin/nandwrite -p $dtbo_block /tmp/anykernel/$dtbo;
+    else
+      dd if=/dev/zero of=$dtbo_block 2>/dev/null;
+      dd if=/tmp/anykernel/$dtbo of=$dtbo_block;
+    fi;
+  fi;
 }
 
 # backup_file <file>
@@ -421,6 +440,11 @@ patch_prop() {
 if [ "$is_slot_device" == 1 ]; then
   slot=$(getprop ro.boot.slot_suffix 2>/dev/null);
   test ! "$slot" && slot=$(grep -o 'androidboot.slot_suffix=.*$' /proc/cmdline | cut -d\  -f1 | cut -d= -f2);
+  if [ ! "$slot" ]; then
+    slot=$(getprop ro.boot.slot 2>/dev/null);
+    test ! "$slot" && slot=$(grep -o 'androidboot.slot=.*$' /proc/cmdline | cut -d\  -f1 | cut -d= -f2);
+    test "$slot" && slot=_$slot;
+  fi;
   test "$slot" && block=$block$slot;
   if [ $? != 0 -o ! -e "$block" ]; then
     ui_print " "; ui_print "Unable to determine active boot slot. Aborting..."; exit 1;