br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Move BootConfig to rust

Browse Source
This commit is contained in:
LoveSy
2025-01-30 18:39:34 +08:00
committed by John Wu
parent 540253a55b
commit 6c612d66d7
6 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/src/init/mount.cpp
+3 -3
View File
@@ -60,10 +60,10 @@ void MagiskInit::collect_devices() {
strscpy(dev.dmname, name.data(), sizeof(dev.dmname));
}
if (auto it = std::ranges::find_if(config.partition_map, [&](const auto &i) {
return i.first == dev.devname;
return i.key == dev.devname;
}); dev.partname[0] == '\0' && it != config.partition_map.end()) {
// use androidboot.partition_map as partname fallback.
strscpy(dev.partname, it->second.data(), sizeof(dev.partname));
strscpy(dev.partname, it->value.data(), sizeof(dev.partname));
}
sprintf(path, "/sys/dev/block/%s", entry->d_name);
xrealpath(path, dev.devpath, sizeof(dev.devpath));
@@ -163,7 +163,7 @@ bool MagiskInit::mount_system_root() {
// Try normal partname
char sys_part[32];
sprintf(sys_part, "system%s", config.slot);
sprintf(sys_part, "system%s", config.slot.data());
dev = find_block(sys_part);
if (dev > 0)
goto mount_root;