br0kenpixel/ReZygisk
1
0
Fork 0
mirror of https://github.com/PerformanC/ReZygisk.git synced 2025-09-06 06:37:01 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

improve: genericize partition variable name (#25)

Browse Source 
Since we use the same partition list for both KSU and AP,
make the vector name more generic.

Also rename the loop variable in ap function from ksu to ap
for consistency
This commit is contained in:
Captain Throwback
2024-07-13 14:42:55 -04:00
committed by GitHub
parent 22e09d41bc
commit 4b7178f1ea
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
loader/src/injector/unmount.cpp
View File

@@ -12,7 +12,7 @@ namespace {
constexpr auto MODULE_DIR = "/data/adb/modules"; constexpr auto MODULE_DIR = "/data/adb/modules";
constexpr auto KSU_OVERLAY_SOURCE = "KSU"; constexpr auto KSU_OVERLAY_SOURCE = "KSU";
constexpr auto AP_OVERLAY_SOURCE = "APatch"; constexpr auto AP_OVERLAY_SOURCE = "APatch";
const std::vector<std::string> KSU_PARTITIONS{"/system", "/vendor", "/product", "/system_ext", "/odm", "/oem"}; const std::vector<std::string> DEVICE_PARTITIONS{"/system", "/vendor", "/product", "/system_ext", "/odm", "/oem"};
void lazy_unmount(const char* mountpoint) { void lazy_unmount(const char* mountpoint) {
if (umount2(mountpoint, MNT_DETACH) != -1) { if (umount2(mountpoint, MNT_DETACH) != -1) {
@@ -44,7 +44,7 @@ void revert_unmount_ksu() {
// Unmount ksu overlays // Unmount ksu overlays
if (info.type == "overlay" if (info.type == "overlay"
&& info.source == KSU_OVERLAY_SOURCE && info.source == KSU_OVERLAY_SOURCE
&& std::find(KSU_PARTITIONS.begin(), KSU_PARTITIONS.end(), info.target) != KSU_PARTITIONS.end()) { && std::find(DEVICE_PARTITIONS.begin(), DEVICE_PARTITIONS.end(), info.target) != DEVICE_PARTITIONS.end()) {
targets.emplace_back(info.target); targets.emplace_back(info.target);
} }
// Unmount temp dir // Unmount temp dir
@@ -87,7 +87,7 @@ void revert_unmount_magisk() {
} }
void revert_unmount_apatch() { void revert_unmount_apatch() {
std::string ksu_loop; std::string ap_loop;
std::vector<std::string> targets; std::vector<std::string> targets;
// Unmount ksu module dir last // Unmount ksu module dir last
@@ -95,7 +95,7 @@ void revert_unmount_apatch() {
for (auto& info: parse_mount_info("self")) { for (auto& info: parse_mount_info("self")) {
if (info.target == MODULE_DIR) { if (info.target == MODULE_DIR) {
ksu_loop = info.source; ap_loop = info.source;
continue; continue;
} }
// Unmount everything mounted to /data/adb // Unmount everything mounted to /data/adb
@@ -105,7 +105,7 @@ void revert_unmount_apatch() {
// Unmount ksu overlays // Unmount ksu overlays
if (info.type == "overlay" if (info.type == "overlay"
&& info.source == AP_OVERLAY_SOURCE && info.source == AP_OVERLAY_SOURCE
&& std::find(KSU_PARTITIONS.begin(), KSU_PARTITIONS.end(), info.target) != KSU_PARTITIONS.end()) { && std::find(DEVICE_PARTITIONS.begin(), DEVICE_PARTITIONS.end(), info.target) != DEVICE_PARTITIONS.end()) {
targets.emplace_back(info.target); targets.emplace_back(info.target);
} }
// Unmount temp dir // Unmount temp dir
@@ -115,7 +115,7 @@ void revert_unmount_apatch() {
} }
for (auto& info: parse_mount_info("self")) { for (auto& info: parse_mount_info("self")) {
// Unmount everything from ksu loop except ksu module dir // Unmount everything from ksu loop except ksu module dir
if (info.source == ksu_loop && info.target != MODULE_DIR) { if (info.source == ap_loop && info.target != MODULE_DIR) {
targets.emplace_back(info.target); targets.emplace_back(info.target);
} }
} }
@@ -124,4 +124,4 @@ void revert_unmount_apatch() {
for (auto& s: reversed(targets)) { for (auto& s: reversed(targets)) {
lazy_unmount(s.data()); lazy_unmount(s.data());
} }
} }