TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-28 03:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

magiskboot: don't clobber /overlay with cpio restore anymore

Browse Source 
- Magisk "dirty" flashes would remove the /overlay directory which might have been put there by a custom kernel or other mod
- this is a leftover from when Magisk itself used /overlay for placing init.magisk.rc, so just remove this file specifically and leave the rest intact
This commit is contained in:
osm0sis 2019-06-27 18:01:00 -03:00 committed by John Wu
parent 19a521d2e9
commit a48c4f9e05
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/jni/magiskboot/ramdisk.cpp
View File

@ -130,8 +130,8 @@ void magisk_cpio::restore() {
} else { } else {
mv(cur, &cur->first[8]); mv(cur, &cur->first[8]);
} }
} else if (str_starts(cur->first, "overlay") || } else if (str_starts(cur->first, "magisk") ||
str_starts(cur->first, "magisk") || cur->first == "overlay/init.magisk.rc" ||
cur->first == "sbin/magic_mask.sh" || cur->first == "sbin/magic_mask.sh" ||
cur->first == "init.magisk.rc") { cur->first == "init.magisk.rc") {
// Some known stuff we can remove // Some known stuff we can remove