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
bcdd7451
Commit
bcdd7451
authored
Nov 04, 2016
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust scripts for resetprop
parent
1d0c36a0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
33 deletions
+49
-33
magiskhide.c
jni/magiskhide.c
+1
-1
sepolicy-inject
jni/sepolicy-inject
+1
-1
flash_script.sh
scripts/flash_script.sh
+12
-12
magic_mask.sh
scripts/magic_mask.sh
+35
-19
No files found.
jni/magiskhide.c
View file @
bcdd7451
...
...
@@ -160,7 +160,7 @@ int main(int argc, char **argv, char **envp) {
logfile
=
fopen
(
"/cache/magisk.log"
,
"a+"
);
setbuf
(
logfile
,
NULL
);
pthread_t
list_monitor
,
unmount_thread
;
pthread_t
list_monitor
;
pthread_mutex_init
(
&
mutex
,
NULL
);
pthread_create
(
&
list_monitor
,
NULL
,
monitor_list
,
"/magisk/.core/magiskhide/hidelist"
);
...
...
sepolicy-inject
@
be1dcb72
Subproject commit
3a0df56605bc9226b4c989979c1d4e9a8a565ad4
Subproject commit
be1dcb7264e8a20b101a93d01bd671a7f56d07c3
scripts/flash_script.sh
View file @
bcdd7451
...
...
@@ -376,7 +376,7 @@ fi
if
(!
$SUPERSU
)
;
then
ui_print
"- Creating backups"
mkdir
.backup 2>/dev/null
cp
-af
init.environ.rc
*
fstab
*
verity_key sepolicy .backup 2>/dev/null
cp
-af
*
fstab
*
verity_key sepolicy .backup 2>/dev/null
if
(
is_mounted /data
)
;
then
cp
-af
$ORIGBOOT
/data/stock_boot.img
else
...
...
@@ -396,17 +396,17 @@ for INIT in init*.rc; do
fi
done
# Add magisk specific
if
[
$(
grep
-c
"export PATH"
init.environ.rc
)
-eq
"0"
]
;
then
sed
-i
"/on init/a
\ \ \ \
export PATH /magisk/.core/bin:/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin:/magisk/.core/busybox"
init.environ.rc
else
if
[
$(
grep
-c
"/magisk/.core/busybox"
init.environ.rc
)
-eq
"0"
]
;
then
sed
-i
"/export PATH/ s/
\/
system
\/
xbin/
\/
system
\/
xbin:
\/
magisk
\/
.core
\/
busybox/g"
init.environ.rc
fi
if
[
$(
grep
-c
"/magisk/.core/bin"
init.environ.rc
)
-eq
"0"
]
&&
(!
$SUPERSU
)
;
then
sed
-i
"/export PATH/ s/
\/
sbin/
\/
magisk
\/
.core
\/
bin:
\/
sbin/g"
init.environ.rc
fi
fi
#
#
Add magisk specific
#
if [ $(grep -c "export PATH" init.environ.rc) -eq "0" ]; then
#
sed -i "/on init/a\ \ \ \ export PATH /magisk/.core/bin:/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin:/magisk/.core/busybox" init.environ.rc
#
else
#
if [ $(grep -c "/magisk/.core/busybox" init.environ.rc) -eq "0" ]; then
#
sed -i "/export PATH/ s/\/system\/xbin/\/system\/xbin:\/magisk\/.core\/busybox/g" init.environ.rc
#
fi
#
if [ $(grep -c "/magisk/.core/bin" init.environ.rc) -eq "0" ] && (! $SUPERSU); then
#
sed -i "/export PATH/ s/\/sbin/\/magisk\/.core\/bin:\/sbin/g" init.environ.rc
#
fi
#
fi
if
(!
$SUPERSU
)
;
then
sed
-i
"/selinux.reload_policy/d"
init.rc
...
...
scripts/magic_mask.sh
View file @
bcdd7451
...
...
@@ -15,8 +15,10 @@ MOUNTINFO=$TMPDIR/mnt
# Use the included busybox for maximum compatibility and reliable results
# e.g. we rely on the option "-c" for cp (reserve contexts), and -exec for find
TOOLPATH
=
/data/busybox
BINPATH
=
/data/magisk
# Legacy support for old phh, we don't change PATH now
# Will remove in the next release
export
OLDPATH
=
$PATH
...
...
@@ -224,11 +226,11 @@ case $1 in
touch
$LOGFILE
chmod
644
$LOGFILE
log_print
"** Magisk post-fs mode running..."
# No more cache mods!
# Only for multirom!
# log_print "** Magisk post-fs mode running..."
unblock
;;
...
...
@@ -244,28 +246,31 @@ case $1 in
fi
# Don't run twice
if
[
"
$(
getprop magisk.restart_pfsd
)
"
!=
"1"
]
;
then
if
[
"
`
getprop magisk.restart_pfsd
`
"
!=
"1"
]
;
then
log_print
"** Magisk post-fs-data mode running..."
# Live patch sepolicy
/data/magisk/sepolicy-inject
--live
-s
su
$BINPATH
/sepolicy-inject
--live
-s
su
# Multirom functions should go here, not available right now
MULTIROM
=
false
# Cache support
if
[
-d
"/cache/data_bin"
]
;
then
rm
-rf
/data/busybox /data/magisk
mkdir
-p
/data/busybox
mv
/cache/data_bin
/data/magisk
chmod
-R
755
/data/busybox /data/magisk
/data/magisk/busybox
--install
-s
/data/busybox
ln
-s
/data/magisk/busybox /data/busybox
/busybox
rm
-rf
$BINPATH
$TOOLPATH
mkdir
-p
$TOOLPATH
mv
/cache/data_bin
$BINPATH
chmod
-R
755
$BINPATH
$TOOLPATH
$BINPATH
/busybox
--install
-s
$TOOLPATH
ln
-s
$BINPATH
/busybox
$TOOLPATH
/busybox
# Prevent issues
rm
-f
/data/busybox/su /data/busybox
/sh
rm
-f
$TOOLPATH
/su
$TOOLPATH
/sh
fi
mv
/cache/stock_boot.img /data 2>/dev/null
chcon
-R
'u:object_r:system_file:s0'
/data/busybox /data/magisk
chcon
-R
'u:object_r:system_file:s0'
$BINPATH
$TOOLPATH
# Image merging
chmod
644
$IMG
/cache/magisk.img /data/magisk_merge.img 2>/dev/null
...
...
@@ -286,7 +291,7 @@ case $1 in
unblock
fi
# Remove empty directories
and remove legacy paths and previous symlink
# Remove empty directories
, legacy paths and symlinks
rm
-rf
$COREDIR
/bin
$COREDIR
/dummy
$COREDIR
/mirror
$TOOLPATH
/find
$MOUNTPOINT
-type
d
-depth
!
-path
"*core*"
-exec
rmdir
{}
\;
2>/dev/null
...
...
@@ -322,7 +327,7 @@ case $1 in
mkdir
-p
$DUMMDIR
mkdir
-p
$MIRRDIR
/system
# Travel through all mods
# Travel through all mods
, all magic happens here
for
MOD
in
$MOUNTPOINT
/
*
;
do
if
[
-f
"
$MOD
/auto_mount"
-a
-d
"
$MOD
/system"
-a
!
-f
"
$MOD
/disable"
]
;
then
(
travel
$MOD
system
)
...
...
@@ -379,7 +384,7 @@ case $1 in
log_print
"Bind mount mirror items"
# Find all empty directores and dummy files, they should be mounted by original files in /system
TOOLPATH
=
/data/busybox
$TOOLPATH
/find
$DUMMDIR
-type
d
\
-exec
sh
-c
'[ -z "
$($TOOLPATH/ls -A $1)
" ] && echo $1'
--
{}
\;
\
-exec
sh
-c
'[ -z "
`$TOOLPATH/ls -A $1`
" ] && echo $1'
--
{}
\;
\
-o
\(
-type
f
-size
0
-print
\)
|
\
while
read
ITEM
;
do
ORIG
=
${
ITEM
/dummy/mirror
}
...
...
@@ -387,8 +392,8 @@ case $1 in
bind_mount
$ORIG
$TARGET
done
# Restart post-fs-data
, since data might be changed
(multirom)
setprop magisk.restart_pfsd 1
# Restart post-fs-data
if necessary
(multirom)
(
$MULTIROM
)
&&
setprop magisk.restart_pfsd 1
fi
unblock
...
...
@@ -400,14 +405,25 @@ case $1 in
log_print
"** Magisk late_start service mode running..."
run_scripts service
#
MagiskHide
#
Hide Safety Net
if
[
-f
"
$COREDIR
/magiskhide/enable"
]
;
then
[
!
-f
"
$COREDIR
/magiskhide/hidelist"
]
&&
mktouch
$COREDIR
/magiskhide/hidelist
log_print
"** Removing tampered read-only system props"
VERIFYBOOT
=
`
getprop ro.boot.verifiedbootstate
`
FLASHLOCKED
=
`
getprop ro.boot.flash.locked
`
VERITYMODE
=
`
getprop ro.boot.veritymode
`
[
!
-z
"
$VERIFYBOOT
"
-a
"
$VERIFYBOOT
"
!=
"green"
]
&&
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.verifiedbootstate green
`
"
[
!
-z
"
$FLASHLOCKED
"
-a
"
$FLASHLOCKED
"
!=
"1"
]
&&
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.flash.locked 1
`
"
[
!
-z
"
$VERITYMODE
"
-a
"
$VERITYMODE
"
!=
"enforcing"
]
&&
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.veritymode enforcing
`
"
mktouch
$COREDIR
/magiskhide/hidelist
chmod
-R
755
$COREDIR
/magiskhide
# Add Safety Net preset
$COREDIR
/magiskhide/add com.google.android.gms.unstable
log_print
"** Starting Magisk Hide"
/data/magisk/magiskhide
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