Test for NVIDIA/Tegra partition naming scheme first

Fixes https://github.com/topjohnwu/Magisk/issues/3014
This commit is contained in:
classic-gentleman 2020-07-21 19:57:06 -03:00 committed by John Wu
parent aed3ab994e
commit 0ed524f173

View File

@ -243,12 +243,12 @@ void SARBase::backup_files() {
void SARBase::mount_system_root() { void SARBase::mount_system_root() {
LOGD("Early mount system_root\n"); LOGD("Early mount system_root\n");
sprintf(blk_info.partname, "system%s", cmd->slot); // Try NVIDIA naming scheme
strcpy(blk_info.partname, "APP");
strcpy(blk_info.block_dev, "/dev/root"); strcpy(blk_info.block_dev, "/dev/root");
auto dev = setup_block(false); auto dev = setup_block(false);
if (dev < 0) { if (dev < 0) {
// Try NVIDIA naming scheme sprintf(blk_info.partname, "system%s", cmd->slot);
strcpy(blk_info.partname, "APP");
dev = setup_block(false); dev = setup_block(false);
if (dev < 0) { if (dev < 0) {
// We don't really know what to do at this point... // We don't really know what to do at this point...