CommonInstaller: only use private busybox when installing from TWRP, when installing from Magisk, Magisk's busybox is used

6 years ago · fab7c6c73b
parent d3a8136a8e
commit fab7c6c73b
4 changed files with 4 additions and 4 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@ -8,7 +8,7 @@
  * cleanup TWRP environment when an installation error occurs during System Mode installation
     * regression from 17.9
  * add busybox build by osm0sis (used during installation only)
-     * fixes possible installation issues with Stock ROMs
+     * fixes possible installation issues with Stock ROMs from TWRP

 ### General Changes

--- a/F-Droid/META-INF/com/google/android/update-binary
+++ b/F-Droid/META-INF/com/google/android/update-binary
@ -26,7 +26,7 @@ set_progress 0.1
 mount_partitions
 unpack_zip
 detect_arch
-setup_busybox
+${BOOTMODE} || setup_busybox

 get_cfg_setup

--- a/Full/META-INF/com/google/android/update-binary
+++ b/Full/META-INF/com/google/android/update-binary
@ -26,7 +26,7 @@ set_progress 0.1
 mount_partitions
 unpack_zip
 detect_arch
-setup_busybox
+${BOOTMODE} || setup_busybox
 set_progress 0.2

 get_cfg_setup
--- a/microG/META-INF/com/google/android/update-binary
+++ b/microG/META-INF/com/google/android/update-binary
@ -26,7 +26,7 @@ set_progress 0.1
 mount_partitions
 unpack_zip
 detect_arch
-setup_busybox
+${BOOTMODE} || setup_busybox

 get_cfg_setup
 get_cfg_overlay