Skip to content

Commit

Permalink
sload_f2fs: update code for correct binary name
Browse files Browse the repository at this point in the history
Change-Id: I7c14ec0b76d82d2b0951fd57fbc7184acc09d25a
(cherry picked from commit 8833868a48b054c708650c136c9b27b48c901ce0)
  • Loading branch information
CaptainThrowback authored and corsicanu committed May 23, 2022
1 parent 4ec197f commit 9212d35
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,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
Expand Down
6 changes: 3 additions & 3 deletions partition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

/**
Expand Down

0 comments on commit 9212d35

Please sign in to comment.