From 30f100e3bc49c7cf939a7dc6a45670960c1e3853 Mon Sep 17 00:00:00 2001 From: dhacker29 Date: Tue, 15 Jul 2014 21:33:29 -0400 Subject: Only disable recovery flash if it is truly "stock" recovery Some roms need the recovery-from-boot.p for auto update of recovery. Typically the use install-[romname]-recovery.sh. So only disable if install-recovery.sh is present. Change-Id: I01f89afc87b9d375d67b44b8b5e9228868a47d69 --- recovery.cpp | 2 +- twrp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recovery.cpp b/recovery.cpp index de9939357..64091305a 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1161,7 +1161,7 @@ main(int argc, char **argv) { // Check for su to see if the device is rooted or not if (PartitionManager.Mount_By_Path("/system", false)) { // Disable flashing of stock recovery - if (TWFunc::Path_Exists("/system/recovery-from-boot.p")) { + if (TWFunc::Path_Exists("/system/recovery-from-boot.p") && TWFunc::Path_Exists("/system/etc/install-recovery.sh")) { rename("/system/recovery-from-boot.p", "/system/recovery-from-boot.bak"); ui_print("Renamed stock recovery file in /system to prevent\nthe stock ROM from replacing TWRP.\n"); } diff --git a/twrp.cpp b/twrp.cpp index 3e0fc9b9a..c3baa2e2d 100644 --- a/twrp.cpp +++ b/twrp.cpp @@ -287,7 +287,7 @@ int main(int argc, char **argv) { // Check for su to see if the device is rooted or not if (PartitionManager.Mount_By_Path("/system", false)) { // Disable flashing of stock recovery - if (TWFunc::Path_Exists("/system/recovery-from-boot.p")) { + if (TWFunc::Path_Exists("/system/recovery-from-boot.p") && TWFunc::Path_Exists("/system/etc/install-recovery.sh")) { rename("/system/recovery-from-boot.p", "/system/recovery-from-boot.bak"); gui_print("Renamed stock recovery file in /system to prevent\nthe stock ROM from replacing TWRP.\n"); } -- cgit v1.2.3