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
198b14e5
Commit
198b14e5
authored
Jan 01, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed various Magic Mount bugs
parent
f9fea265
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
27 deletions
+33
-27
magic_mask.sh
scripts/magic_mask.sh
+33
-27
No files found.
scripts/magic_mask.sh
View file @
198b14e5
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
LOGFILE
=
/cache/magisk.log
LOGFILE
=
/cache/magisk.log
IMG
=
/data/magisk.img
IMG
=
/data/magisk.img
BLACKLIST
=
"/system/lib /system/lib64 /system/etc /vendor/lib /vendor/lib64"
MOUNTPOINT
=
/magisk
MOUNTPOINT
=
/magisk
...
@@ -17,13 +18,9 @@ MOUNTINFO=$TMPDIR/mnt
...
@@ -17,13 +18,9 @@ MOUNTINFO=$TMPDIR/mnt
TOOLPATH
=
/data/busybox
TOOLPATH
=
/data/busybox
BINPATH
=
/data/magisk
BINPATH
=
/data/magisk
export
OLDPATH
=
$PATH
export
PATH
=
$TOOLPATH
:
$OLDPATH
# Default permissions
# Default permissions
umask
022
umask
022
log_print
()
{
log_print
()
{
echo
"
$1
"
echo
"
$1
"
echo
"
$1
"
>>
$LOGFILE
echo
"
$1
"
>>
$LOGFILE
...
@@ -39,6 +36,13 @@ mktouch() {
...
@@ -39,6 +36,13 @@ mktouch() {
fi
fi
}
}
in_list
()
{
for
i
in
$2
;
do
[
"
$1
"
=
"
$i
"
]
&&
return
0
done
return
1
}
unblock
()
{
unblock
()
{
touch
/dev/.magisk.unblock
touch
/dev/.magisk.unblock
exit
exit
...
@@ -117,6 +121,9 @@ travel() {
...
@@ -117,6 +121,9 @@ travel() {
}
}
clone_dummy
()
{
clone_dummy
()
{
LINK
=
true
in_list
$1
"
$BLACKLIST
"
&&
LINK
=
false
for
ITEM
in
$MIRRDIR$1
/
*
;
do
for
ITEM
in
$MIRRDIR$1
/
*
;
do
REAL
=
${
ITEM
#
$MIRRDIR
}
REAL
=
${
ITEM
#
$MIRRDIR
}
if
[
-d
$MOUNTINFO$REAL
]
;
then
if
[
-d
$MOUNTINFO$REAL
]
;
then
...
@@ -128,13 +135,16 @@ clone_dummy() {
...
@@ -128,13 +135,16 @@ clone_dummy() {
# Copy original symlink
# Copy original symlink
cp
-afc
$ITEM
$DUMMDIR$REAL
cp
-afc
$ITEM
$DUMMDIR$REAL
else
else
if
[
-d
$ITEM
]
;
then
if
$LINK
&&
[
!
-e
$MOUNTINFO$REAL
]
;
then
mkdir
-p
$DUMMDIR$REAL
ln
-s
$MIRRDIR$REAL
$DUMMDIR$REAL
else
else
mktouch
$DUMMDIR$REAL
if
[
-d
$ITEM
]
;
then
mkdir
-p
$DUMMDIR$REAL
else
mktouch
$DUMMDIR$REAL
fi
[
!
-e
$MOUNTINFO$REAL
]
&&
mktouch
$MOUNTINFO
/mirror
$REAL
fi
fi
# Mount the mirror if not module item
[
!
-e
$MOUNTINFO$REAL
]
&&
mktouch
$MOUNTINFO
/mirror
$REAL
fi
fi
fi
fi
done
done
...
@@ -247,12 +257,15 @@ case $1 in
...
@@ -247,12 +257,15 @@ case $1 in
post-fs-data
)
post-fs-data
)
# /data not mounted yet
# /data not mounted yet
!
mount |
grep
" /data "
&&
unblock
!
mount |
grep
" /data "
>
/dev/null
&&
unblock
mount |
grep
" /data "
|
grep
"tmpfs"
&&
unblock
mount |
grep
" /data "
|
grep
"tmpfs"
>
/dev/null
&&
unblock
# Don't run twice
# Don't run twice
if
[
"
`
getprop magisk.restart_pfsd
`
"
!=
"1"
]
;
then
if
[
"
`
getprop magisk.restart_pfsd
`
"
!=
"1"
]
;
then
export
OLDPATH
=
$PATH
export
PATH
=
$TOOLPATH
:
$OLDPATH
log_print
"** Magisk post-fs-data mode running..."
log_print
"** Magisk post-fs-data mode running..."
# Cache support
# Cache support
...
@@ -297,10 +310,11 @@ case $1 in
...
@@ -297,10 +310,11 @@ case $1 in
# Remove empty directories, legacy paths, symlinks, old temporary images
# Remove empty directories, legacy paths, symlinks, old temporary images
find
$MOUNTPOINT
-type
d
-depth
!
-path
"*core*"
-exec
rmdir
{}
\;
2>/dev/null
find
$MOUNTPOINT
-type
d
-depth
!
-path
"*core*"
-exec
rmdir
{}
\;
2>/dev/null
rm
-rf
$COREDIR
/bin
$COREDIR
/dummy
$COREDIR
/mirror /data/magisk/
*
.img
rm
-rf
$COREDIR
/bin
$COREDIR
/dummy
$COREDIR
/mirror /data/magisk/
*
.img
2>/dev/null
# Remove modules that is labeled to be removed
# Remove modules that is labeled to be removed
for
MOD
in
$MOUNTPOINT
/
*
;
do
for
MOD
in
$MOUNTPOINT
/
*
;
do
rm
-f
$MOD
/system/placeholder 2>/dev/null
if
[
-f
$MOD
/remove
]
||
[
$MOD
=
zzsupersu
]
;
then
if
[
-f
$MOD
/remove
]
||
[
$MOD
=
zzsupersu
]
;
then
log_print
"Remove module:
$MOD
"
log_print
"Remove module:
$MOD
"
rm
-rf
$MOD
rm
-rf
$MOD
...
@@ -329,6 +343,9 @@ case $1 in
...
@@ -329,6 +343,9 @@ case $1 in
mkdir
-p
$DUMMDIR
mkdir
-p
$DUMMDIR
mkdir
-p
$MIRRDIR
/system
mkdir
-p
$MIRRDIR
/system
# Remove crap folder
rm
-rf
$MOUNTPOINT
/lost+found
# Travel through all mods
# Travel through all mods
for
MOD
in
$MOUNTPOINT
/
*
;
do
for
MOD
in
$MOUNTPOINT
/
*
;
do
if
[
-f
$MOD
/auto_mount
-a
-d
$MOD
/system
-a
!
-f
$MOD
/disable
]
;
then
if
[
-f
$MOD
/auto_mount
-a
-d
$MOD
/system
-a
!
-f
$MOD
/disable
]
;
then
...
@@ -345,18 +362,6 @@ case $1 in
...
@@ -345,18 +362,6 @@ case $1 in
cp
-afc
/system/bin/linker
*
/system/bin/t
*
box
$DUMMDIR
/system/bin/
cp
-afc
/system/bin/linker
*
/system/bin/t
*
box
$DUMMDIR
/system/bin/
fi
fi
DISABLEHIDE
=
false
for
i
in
/system /system/lib /system/lib64 /system/vendor /system/vendor/lib /system/vendor/lib64
;
do
[
-f
$MOUNTINFO
/dummy
$1
]
&&
DISABLEHIDE
=
true
&&
break
done
# Crash prevention!!
$DISABLEHIDE
&&
rm
-f
$COREDIR
/magiskhide/enable 2>/dev/null
# Remove crap folder
rm
-rf
$MOUNTPOINT
/lost+found
# Start doing tasks
# Start doing tasks
# Stage 1
# Stage 1
...
@@ -371,9 +376,10 @@ case $1 in
...
@@ -371,9 +376,10 @@ case $1 in
else
else
ln
-s
$MIRRDIR
/system/vendor
$MIRRDIR
/vendor
ln
-s
$MIRRDIR
/system/vendor
$MIRRDIR
/vendor
fi
fi
# Since mirrors always exist, we load libraries from mirrors
# Since mirrors always exist, we load libraries from mirrors
LD_LIBRARY_PATH
=
$MIRRDIR
/system/lib:
$MIRRDIR
/vendor/lib
export
LD_LIBRARY_PATH
=
$MIRRDIR
/system/lib:
$MIRRDIR
/vendor/lib
[
-d
/system/lib64
]
LD_LIBRARY_PATH
=
$MIRRDIR
/system/lib64:
$MIRRDIR
/vendor/lib64
[
-d
/system/lib64
]
&&
export
LD_LIBRARY_PATH
=
$MIRRDIR
/system/lib64:
$MIRRDIR
/vendor/lib64
# Stage 2
# Stage 2
log_print
"* Stage 2: Mount dummy skeletons"
log_print
"* Stage 2: Mount dummy skeletons"
...
@@ -457,7 +463,7 @@ case $1 in
...
@@ -457,7 +463,7 @@ case $1 in
# Add Safety Net preset
# Add Safety Net preset
$COREDIR
/magiskhide/add com.google.android.gms.unstable
$COREDIR
/magiskhide/add com.google.android.gms.unstable
log_print
"* Starting Magisk Hide"
log_print
"* Starting Magisk Hide"
/data/magisk/magiskhide
/data/magisk/magiskhide
--daemon
fi
fi
;;
;;
...
...
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