TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-15 15:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support new 1500 template

Browse Source
This commit is contained in:
topjohnwu
2017-12-26 03:23:58 +08:00
parent 84ffdf0ed5
commit 74da6e1dc0
2 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/jni/core/bootstages.c
View File

@@ -392,15 +392,16 @@ static void simple_mount(const char *path) {
* Miscellaneous *
*****************/
#define alt_img ((char *[]) \
{ "/cache/magisk.img", "/data/magisk_merge.img", "/data/adb/magisk_merge.img", NULL })
static int prepare_img() {
// First merge images
if (merge_img("/cache/magisk.img", MAINIMG)) {
LOGE("Image merge /cache/magisk.img -> " MAINIMG " failed!\n");
return 1;
}
if (merge_img("/data/magisk_merge.img", MAINIMG)) {
LOGE("Image merge /data/magisk_merge.img -> " MAINIMG " failed!\n");
return 1;
// Merge images
for (int i = 0; alt_img[i]; ++i) {
if (merge_img(alt_img[i], MAINIMG)) {
LOGE("Image merge %s -> " MAINIMG " failed!\n", alt_img[i]);
return 1;
}
}
if (access(MAINIMG, F_OK) == -1) {