From 7048aa10145fbdcaadb32a1e35b9217fcc9b3ff3 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Sun, 12 Mar 2023 04:19:01 +0800 Subject: [PATCH] Rename sepolicy.rules -> rules --- .../magisk/core/model/module/LocalModule.kt | 8 ++++---- app/src/main/res/raw/manager.sh | 2 +- native/src/core/bootstages.cpp | 4 ++-- native/src/include/magisk.hpp | 2 +- native/src/init/mount.cpp | 6 +++--- scripts/util_functions.sh | 17 +++++------------ 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/model/module/LocalModule.kt b/app/src/main/java/com/topjohnwu/magisk/core/model/module/LocalModule.kt index e4a02033d..1e27048fb 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/model/module/LocalModule.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/model/module/LocalModule.kt @@ -43,10 +43,10 @@ data class LocalModule( set(enable) { if (enable) { disableFile.delete() - Shell.cmd("copy_sepolicy_rules").submit() + Shell.cmd("copy_rules").submit() } else { !disableFile.createNewFile() - Shell.cmd("copy_sepolicy_rules").submit() + Shell.cmd("copy_rules").submit() } } @@ -56,10 +56,10 @@ data class LocalModule( if (remove) { if (updateFile.exists()) return removeFile.createNewFile() - Shell.cmd("copy_sepolicy_rules").submit() + Shell.cmd("copy_rules").submit() } else { removeFile.delete() - Shell.cmd("copy_sepolicy_rules").submit() + Shell.cmd("copy_rules").submit() } } diff --git a/app/src/main/res/raw/manager.sh b/app/src/main/res/raw/manager.sh index 756302dae..e8e6ae3b2 100644 --- a/app/src/main/res/raw/manager.sh +++ b/app/src/main/res/raw/manager.sh @@ -67,7 +67,7 @@ direct_install() { rm -f $1/new-boot.img fix_env $1 run_migrations - copy_sepolicy_rules + copy_rules return 0 } diff --git a/native/src/core/bootstages.cpp b/native/src/core/bootstages.cpp index 1199007c8..12b8d59d3 100644 --- a/native/src/core/bootstages.cpp +++ b/native/src/core/bootstages.cpp @@ -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); diff --git a/native/src/include/magisk.hpp b/native/src/include/magisk.hpp index 886aadf16..16a091e4a 100644 --- a/native/src/include/magisk.hpp +++ b/native/src/include/magisk.hpp @@ -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" diff --git a/native/src/init/mount.cpp b/native/src/init/mount.cpp index ec1dcb25f..a1427370b 100644 --- a/native/src/init/mount.cpp +++ b/native/src/init/mount.cpp @@ -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"); } } diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh index 0e2ead32e..fe104cee6 100644 --- a/scripts/util_functions.sh +++ b/scripts/util_functions.sh @@ -296,13 +296,6 @@ mount_partitions() { # Allow /system/bin commands (dalvikvm) on Android 10+ in recovery $BOOTMODE || mount_apex - - # Mount sepolicy rules dir locations in recovery (best effort) - if ! $BOOTMODE; then - mount_name "cache cac" /cache - mount_name metadata /metadata - mount_name persist /persist - fi } # loop_setup , sets LOOPDEV @@ -636,10 +629,10 @@ run_migrations() { done } -copy_sepolicy_rules() { - local RULESDIR=$(magisk --path)/.magisk/sepolicy.rules +copy_rules() { + local RULESDIR=$(magisk --path)/.magisk/rules if ! grep -q " $RULESDIR " /proc/mounts; then - ui_print "- Unable to find sepolicy rules dir" + ui_print "- Unable to find rules dir" return 1 fi @@ -792,10 +785,10 @@ install_module() { cp -af $MODPATH/module.prop $NVBASE/modules/$MODID/module.prop fi - # Copy over custom sepolicy rules + # Copy over custom rules if [ -f $MODPATH/sepolicy.rule ]; then ui_print "- Installing custom sepolicy rules" - copy_sepolicy_rules + copy_rules fi # Remove stuff that doesn't belong to modules and clean up any empty directories