gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-05 01:07:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use androidboot.partition_map as a fallback for matching partition names in the preinit finding.

Browse Source
This commit is contained in:
ChsBuffer
2024-08-07 12:13:12 +08:00
committed by John Wu
parent 1db80228e8
commit 1f974cb220
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
native/src/init/mount.cpp
View File

@@ -56,6 +56,8 @@ static void collect_devices() {
if (access(path, F_OK) == 0) {
auto name = rtrim(full_read(path));
strcpy(dev.dmname, name.data());
} else {
dev.dmname[0] = '\0';
}
sprintf(path, "/sys/dev/block/%s", entry->d_name);
xrealpath(path, dev.devpath, sizeof(dev.devpath));
@@ -70,11 +72,17 @@ static struct {
} blk_info;
static dev_t setup_block() {
const auto partition_map = load_partition_map();
if (dev_list.empty())
collect_devices();
for (int tries = 0; tries < 3; ++tries) {
for (auto &dev : dev_list) {
// use androidboot.partition_map as partname fallback.
if (dev.partname[0] == '\0') {
auto partname = get_partition_name_for_device(partition_map, dev.devname);
strcpy(dev.partname, partname.c_str());
}
if (strcasecmp(dev.partname, blk_info.partname) == 0)
LOGD("Setup %s: [%s] (%d, %d)\n", dev.partname, dev.devname, dev.major, dev.minor);
else if (strcasecmp(dev.dmname, blk_info.partname) == 0)