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

Skip invalid slot_suffix argument

Browse Source 
Many Amlogic devices (e.g. FireTV 2nd gen Cube, Vero 4k+, MI Smart Speaker, etc.) are A-only with androidboot.slot_suffix=normal argument. I think "normal" actually means A-only in this case so just ignore it.

Fix topjohnwu#5806
This commit is contained in:
残页 2022-05-10 11:57:14 +08:00 committed by John Wu
parent 575c417403
commit 7505599ea0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
native/jni/init/getinfo.cpp
View File

@ -163,6 +163,11 @@ void setup_klog() {
void BootConfig::set(const kv_pairs &kv) { void BootConfig::set(const kv_pairs &kv) {
for (const auto &[key, value] : kv) { for (const auto &[key, value] : kv) {
if (key == "androidboot.slot_suffix") { if (key == "androidboot.slot_suffix") {
// Many Amlogic devices are A-only but have slot_suffix...
if (value == "normal") {
LOGW("Skip invalid androidboot.slot_suffix=[normal]\n");
continue;
}
strlcpy(slot, value.data(), sizeof(slot)); strlcpy(slot, value.data(), sizeof(slot));
} else if (key == "androidboot.slot") { } else if (key == "androidboot.slot") {
slot[0] = '_'; slot[0] = '_';