Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
f443cbaa
Commit
f443cbaa
authored
Nov 24, 2021
by
vvb2060
Committed by
John Wu
Jan 18, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Always run non disabled module post-fs-data scripts"
This reverts commit
4dfb193d
.
parent
dbf45da8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
module.cpp
native/jni/core/module.cpp
+14
-14
No files found.
native/jni/core/module.cpp
View file @
f443cbaa
...
...
@@ -695,13 +695,13 @@ static void collect_modules(bool open_zygisk) {
return
;
module_info
info
;
if
(
open_zygisk
)
{
if
(
zygisk_enabled
)
{
// Riru and its modules are not compatible with zygisk
if
(
entry
->
d_name
==
"riru-core"
sv
||
faccessat
(
modfd
,
"riru"
,
F_OK
,
0
)
==
0
)
{
LOGI
(
"%s: ignore
\n
"
,
entry
->
d_name
);
return
;
}
if
(
open_zygisk
)
{
#if defined(__arm__)
info
.
z32
=
openat
(
modfd
,
"zygisk/armeabi-v7a.so"
,
O_RDONLY
|
O_CLOEXEC
);
#elif defined(__aarch64__)
...
...
@@ -715,6 +715,7 @@ static void collect_modules(bool open_zygisk) {
#else
#error Unsupported ABI
#endif
}
}
else
{
// Ignore zygisk modules when zygisk is not enabled
if
(
faccessat
(
modfd
,
"zygisk"
,
F_OK
,
0
)
==
0
)
{
...
...
@@ -722,11 +723,10 @@ static void collect_modules(bool open_zygisk) {
return
;
}
}
}
info
.
name
=
entry
->
d_name
;
module_list
->
push_back
(
info
);
});
if
(
open_zygisk
&&
zygisk_enabled
)
{
if
(
zygisk_enabled
)
{
bool
use_memfd
=
true
;
auto
convert_to_memfd
=
[
&
](
int
fd
)
->
int
{
if
(
fd
<
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment