TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-23 18:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

No need to manually parse mount flags

Browse Source
This commit is contained in:
LoveSy 2023-02-26 12:22:11 +08:00 committed by John Wu
parent 3d3082bc82
commit d7158131e4
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
native/src/core/bootstages.cpp
View File

@ -1,7 +1,6 @@
#include <sys/mount.h>
#include <sys/wait.h>
#include <sys/sysmacros.h>
#include <sys/statvfs.h>
#include <linux/input.h>
#include <libgen.h>
#include <vector>
@ -71,19 +70,7 @@ static void mount_mirrors() {
LOGI("* Mounting module root\n");
if (access(SECURE_DIR, F_OK) == 0 || (SDK_INT < 24 && xmkdir(SECURE_DIR, 0700))) {
if (auto dest = MAGISKTMP + "/" MODULEMNT; mount_mirror(MODULEROOT, dest)) {
// remount to clear nosuid flag
struct statvfs st{};
statvfs(dest.data(), &st);
for (const auto &info: parse_mount_info("self")) {
if (info.target != dest) {
continue;
}
// strip rw, from fs options
if (auto pos = info.fs_option.find_first_of(','); pos != string::npos) {
xmount("", dest.data(), nullptr, MS_REMOUNT | (st.f_flag & ~MS_NOSUID), info.fs_option.data() + pos + 1);
}
break;
}
xmount(nullptr, dest.data(), nullptr, MS_REMOUNT | MS_BIND, nullptr);
restorecon();
chmod(SECURE_DIR, 0700);
}