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
51bc27a8
Commit
51bc27a8
authored
Jan 15, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid F2FS like a plague
parent
71b08379
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
mount.cpp
native/jni/init/mount.cpp
+3
-3
util_functions.sh
scripts/util_functions.sh
+1
-1
No files found.
native/jni/init/mount.cpp
View file @
51bc27a8
...
@@ -228,9 +228,9 @@ void MagiskInit::mount_rules_dir(const char *dev_base, const char *mnt_base) {
...
@@ -228,9 +228,9 @@ void MagiskInit::mount_rules_dir(const char *dev_base, const char *mnt_base) {
if
(
setup_block
(
false
)
<
0
)
if
(
setup_block
(
false
)
<
0
)
goto
cache
;
goto
cache
;
}
}
//
Try to mount with either ext4 or f2fs
//
WARNING: DO NOT ATTEMPT TO MOUNT F2FS AS IT MAY CRASH THE KERNEL
// Failure means either
FDE
or metadata encryption
// Failure means either
f2fs, FDE,
or metadata encryption
if
(
!
do_mount
(
"ext4"
)
&&
!
do_mount
(
"f2fs"
)
)
if
(
!
do_mount
(
"ext4"
))
goto
cache
;
goto
cache
;
strcpy
(
p
,
"/data/unencrypted"
);
strcpy
(
p
,
"/data/unencrypted"
);
...
...
scripts/util_functions.sh
View file @
51bc27a8
...
@@ -608,7 +608,7 @@ copy_sepolicy_rules() {
...
@@ -608,7 +608,7 @@ copy_sepolicy_rules() {
local
active_dir
=
$(
magisk
--path
)
/.magisk/mirror/sepolicy.rules
local
active_dir
=
$(
magisk
--path
)
/.magisk/mirror/sepolicy.rules
if
[
-e
$active_dir
]
;
then
if
[
-e
$active_dir
]
;
then
RULESDIR
=
$(
readlink
-f
$active_dir
)
RULESDIR
=
$(
readlink
-f
$active_dir
)
elif
[
-d
/data/unencrypted
]
&&
!
grep
' /data '
/proc/mounts |
grep
-q
'dm-
'
;
then
elif
[
-d
/data/unencrypted
]
&&
!
grep
' /data '
/proc/mounts |
grep
-q
E
'dm-|f2fs
'
;
then
RULESDIR
=
/data/unencrypted/magisk
RULESDIR
=
/data/unencrypted/magisk
elif
grep
-q
' /cache '
/proc/mounts
;
then
elif
grep
-q
' /cache '
/proc/mounts
;
then
RULESDIR
=
/cache/magisk
RULESDIR
=
/cache/magisk
...
...
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