Minor tweaks for patching tar files

This commit is contained in:
topjohnwu 2021-01-11 19:47:36 -08:00
parent eb21c8b42e
commit 79dfdb29e7

View File

@ -191,9 +191,10 @@ abstract class MagiskInstallImpl : KoinComponent {
if (rawData.size < 256) if (rawData.size < 256)
continue continue
// Patch flags to AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED // Patch flags to AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED |
// AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
console.add("-- Patching: vbmeta.img") console.add("-- Patching: vbmeta.img")
ByteBuffer.wrap(rawData).putInt(120, 2) ByteBuffer.wrap(rawData).putInt(120, 3)
tarOut.putNextEntry(newEntry("vbmeta.img", rawData.size.toLong())) tarOut.putNextEntry(newEntry("vbmeta.img", rawData.size.toLong()))
tarOut.write(rawData) tarOut.write(rawData)
} else { } else {
@ -204,7 +205,7 @@ abstract class MagiskInstallImpl : KoinComponent {
} }
val boot = SuFile.open(installDir, "boot.img") val boot = SuFile.open(installDir, "boot.img")
val recovery = SuFile.open(installDir, "recovery.img") val recovery = SuFile.open(installDir, "recovery.img")
if (recovery.exists() && boot.exists()) { if (Config.recovery && recovery.exists() && boot.exists()) {
// Install Magisk to recovery // Install Magisk to recovery
srcBoot = recovery.path srcBoot = recovery.path
// Repack boot image to prevent restore // Repack boot image to prevent restore