Always include boot image when processing tar

Credits: @BlackMesa123

Fix #7132, close #7133

app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt

@@ -232,7 +232,19 @@ abstract class MagiskInstallImpl protected constructor(
         val boot = installDir.getChildFile("boot.img")
         val initBoot = installDir.getChildFile("init_boot.img")
         val recovery = installDir.getChildFile("recovery.img")
-        if (Config.recovery && recovery.exists() && boot.exists()) {
+
+        fun ExtendedFile.copyToTar() {
+            newInputStream().use {
+                tarOut.putNextEntry(newTarEntry(name, length()))
+                it.copyTo(tarOut)
+            }
+            delete()
+        }
+
+        // Patch priority: recovery > init_boot > boot
+        return when {
+            recovery.exists() -> {
+                if (boot.exists()) {
                     // Repack boot image to prevent auto restore
                     arrayOf(
                         "cd $installDir",
@@ -243,21 +255,17 @@ abstract class MagiskInstallImpl protected constructor(
                         "./magiskboot cleanup",
                         "rm -f new-boot.img",
                         "cd /").sh()
-            boot.newInputStream().use {
+                    boot.copyToTar()
-                tarOut.putNextEntry(newTarEntry("boot.img", boot.length()))
+                }
-                it.copyTo(tarOut)
+                recovery
+            }
+            initBoot.exists() -> {
+                if (boot.exists())
+                    boot.copyToTar()
+                initBoot
             }
-            boot.delete()
-            // Install to recovery
-            return recovery
-        } else {
-            return when {
-                initBoot.exists() -> initBoot
             boot.exists() -> boot
-                else -> {
+            else -> throw NoBootException()
-                    throw NoBootException()
-                }
-            }
         }
     }