TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 20:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support Samsung 2SI with skip_initramfs in dtb cmdline

Browse Source 
Samsung Galaxy A21S and Galaxy M12, probably others, are hdr_v2 boot.img with 2SI judging by the ramdisk contents, but the dtb contains an extra cmdline with skip_initramfs present, even though this shouldn't exist on 2SI and the kernel apparently doesn't even contain a skip_initramfs function

I can't find examples of other devices where skip_initramfs is present in the dtb other than these so patch it out like we do the kernel

Co-authored-by: topjohnwu <topjohnwu@gmail.com>
This commit is contained in:
Chris Renshaw 2021-10-30 21:20:10 -07:00 committed by topjohnwu
parent 6663fd3526
commit 59161efd08
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
native/jni/magiskboot/dtb.cpp
View File

@ -141,8 +141,22 @@ static bool dtb_patch(const char *file) {
fdt = static_cast<uint8_t*>(memmem(fdt, end - fdt, DTB_MAGIC, sizeof(fdt32_t))); fdt = static_cast<uint8_t*>(memmem(fdt, end - fdt, DTB_MAGIC, sizeof(fdt32_t)));
if (fdt == nullptr) if (fdt == nullptr)
break; break;
int node;
// Patch the chosen node for bootargs
fdt_for_each_subnode(node, fdt, 0) {
if (fdt_get_name(fdt, node, nullptr) != "chosen"sv)
continue;
int len;
if (char *value = (char *) fdt_getprop(fdt, node, "bootargs", &len)) {
if (char *skip = strstr(value, "skip_initramfs")) {
fprintf(stderr, "Patch [skip_initramfs] -> [want_initramfs]\n");
// Don't use strcpy, we do NOT want it null terminated
memcpy(skip, "want", 4);
patched = true;
}
}
}
if (int fstab = find_fstab(fdt); fstab >= 0) { if (int fstab = find_fstab(fdt); fstab >= 0) {
int node;
fdt_for_each_subnode(node, fdt, fstab) { fdt_for_each_subnode(node, fdt, fstab) {
if (!keep_verity) { if (!keep_verity) {
int len; int len;