From d5e2c5247e416d5c381eb8d3a0becd4036591573 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Sat, 21 May 2022 10:44:13 -0400 Subject: [PATCH] sload_f2fs: update code for correct binary name Change-Id: I7c14ec0b76d82d2b0951fd57fbc7184acc09d25a (cherry picked from commit 8833868a48b054c708650c136c9b27b48c901ce0) --- Android.mk | 2 +- partition.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index d65930ee..679c2ec6 100755 --- a/Android.mk +++ b/Android.mk @@ -549,7 +549,7 @@ ifeq ($(TW_INCLUDE_NTFS_3G),true) mkfs.ntfs endif ifeq ($(TARGET_USERIMAGES_USE_F2FS), true) - TWRP_REQUIRED_MODULES += sload.f2fs \ + TWRP_REQUIRED_MODULES += sload_f2fs \ libfs_mgr \ fs_mgr \ libinit diff --git a/partition.cpp b/partition.cpp index 6d1825d8..f0406205 100755 --- a/partition.cpp +++ b/partition.cpp @@ -2443,7 +2443,7 @@ bool TWPartition::Wipe_F2FS() { } needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false); - needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false); + needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false); unsigned long long dev_sz = TWFunc::IOCTL_Get_Block_Size(Actual_Block_Device.c_str()); if (!dev_sz) return false; @@ -2460,8 +2460,8 @@ bool TWPartition::Wipe_F2FS() { f2fs_command += " " + Actual_Block_Device + " " + dev_sz_str; - if (TWFunc::Path_Exists("/system/bin/sload.f2fs")) { - f2fs_command += " && sload.f2fs -t /data " + Actual_Block_Device; + if (TWFunc::Path_Exists("/system/bin/sload_f2fs")) { + f2fs_command += " && sload_f2fs -t /data " + Actual_Block_Device; } /**