Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-13 13:47:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename sepolicy.rules -> rules

Browse Source
This commit is contained in:
LoveSy
2023-03-12 04:19:01 +08:00
committed by John Wu
parent 1c2fcd14b5
commit 7048aa1014
6 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ static void mount_mirrors() {
restorecon();
}
// check and mount sepolicy.rules
// check and mount rules
if (struct stat st{}; stat((MAGISKTMP + "/" BLOCKDIR "/rules").data(), &st) == 0 && (st.st_mode & S_IFBLK)) {
dev_t rules_dev = st.st_rdev;
for (const auto &info: self_mount_info) {
@ -153,7 +153,7 @@ dev_t find_rules_device() {
}
if (!custom_rules_dir.empty()) {
auto rules_dir = getenv("MAGISKTMP") + "/sepolicy.rules"s;
auto rules_dir = getenv("MAGISKTMP") + "/rules"s;
mkdirs(custom_rules_dir.data(), 0700);
mkdirs(rules_dir.data(), 0700);
xmount(custom_rules_dir.data(), rules_dir.data(), nullptr, MS_BIND, nullptr);

2
native/src/include/magisk.hpp
View File

@ -18,7 +18,7 @@
extern std::string MAGISKTMP;
#define INTLROOT ".magisk"
#define MIRRDIR INTLROOT "/mirror"
#define RULESDIR INTLROOT "/sepolicy.rules"
#define RULESDIR INTLROOT "/rules"
#define BLOCKDIR INTLROOT "/block"
#define WORKERDIR INTLROOT "/worker"
#define MODULEMNT INTLROOT "/modules"

6
native/src/init/mount.cpp
View File

@ -133,15 +133,15 @@ static void mount_rules_dir(string path, dev_t rules_dev) {
// Create bind mount
xmkdirs(RULESDIR, 0);
if (access(custom_rules_dir.data(), F_OK)) {
LOGW("empty sepolicy.rules: %s\n", custom_rules_dir.data());
LOGW("empty rules: %s\n", custom_rules_dir.data());
} else {
LOGD("sepolicy.rules: %s\n", custom_rules_dir.data());
LOGD("rules: %s\n", custom_rules_dir.data());
xmount(custom_rules_dir.data(), RULESDIR, nullptr, MS_BIND, nullptr);
mount_list.emplace_back(path += "/" RULESDIR);
}
xumount2(MIRRDIR "/rules", MNT_DETACH);
} else {
PLOGE("Failed to mount sepolicy.rules %u:%u", major(rules_dev), minor(rules_dev));
PLOGE("Failed to mount rules %u:%u", major(rules_dev), minor(rules_dev));
unlink(BLOCKDIR "/rules");
}
}