From aa72a080b03ccda4fa6de30e5eca385a3d86d257 Mon Sep 17 00:00:00 2001
From: Chris Renshaw <osm0sis@outlook.com>
Date: Mon, 23 Mar 2020 20:24:18 -0300
Subject: [PATCH] core: clean up /data/adb/magisk.img, etc. as well

- now that magisk.img -> /data/adb/modules migration is no longer taking place make sure all magisk.img locations get cleaned up
---
 native/jni/core/bootstages.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/native/jni/core/bootstages.cpp b/native/jni/core/bootstages.cpp
index 9faec4038..a44a840eb 100644
--- a/native/jni/core/bootstages.cpp
+++ b/native/jni/core/bootstages.cpp
@@ -342,7 +342,10 @@ static bool magisk_env() {
 	// Remove stuffs
 	rm_rf("/cache/data_adb");
 	rm_rf("/data/adb/modules/.core");
+	unlink("/data/adb/magisk.img");
+	unlink("/data/adb/magisk_merge.img");
 	unlink("/data/magisk.img");
+	unlink("/data/magisk_merge.img");
 	unlink("/data/magisk_debug.log");
 
 	// Directories in tmpfs overlay