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
81d054a5
Commit
81d054a5
authored
Mar 30, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust scripts
parent
2e185f4e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
32 deletions
+34
-32
flash_script.sh
scripts/flash_script.sh
+1
-1
magic_mask.sh
scripts/magic_mask.sh
+26
-24
enable
zip_static/common/magiskhide/enable
+7
-7
No files found.
scripts/flash_script.sh
View file @
81d054a5
...
@@ -292,7 +292,7 @@ fi
...
@@ -292,7 +292,7 @@ fi
MAGISKLOOP
=
$LOOPDEVICE
MAGISKLOOP
=
$LOOPDEVICE
# Core folders and scripts
# Core folders and scripts
mkdir
-p
$COREDIR
/bin
$COREDIR
/magiskhide
$COREDIR
/post-fs-data.d
$COREDIR
/service.d 2>/dev/null
mkdir
-p
$COREDIR
/bin
$COREDIR
/
props
$COREDIR
/
magiskhide
$COREDIR
/post-fs-data.d
$COREDIR
/service.d 2>/dev/null
cp
-af
$COMMONDIR
/magiskhide/.
$COREDIR
/magiskhide
cp
-af
$COMMONDIR
/magiskhide/.
$COREDIR
/magiskhide
cp
-af
$BINDIR
/resetprop
$BINDIR
/magiskhide
$BINDIR
/su
$BINDIR
/magiskpolicy
$COREDIR
/bin
cp
-af
$BINDIR
/resetprop
$BINDIR
/magiskhide
$BINDIR
/su
$BINDIR
/magiskpolicy
$COREDIR
/bin
# Legacy support
# Legacy support
...
...
scripts/magic_mask.sh
View file @
81d054a5
...
@@ -317,6 +317,20 @@ case $1 in
...
@@ -317,6 +317,20 @@ case $1 in
exit
exit
fi
fi
if
[
-f
$DATABIN
/magisk.apk
]
;
then
if
!
ls
/data/app |
grep
com.topjohnwu.magisk
;
then
mkdir
/data/app/com.topjohnwu.magisk-1
cp
$DATABIN
/magisk.apk /data/app/com.topjohnwu.magisk-1/base.apk
chown
1000.1000 /data/app/com.topjohnwu.magisk-1
chown
1000.1000 /data/app/com.topjohnwu.magisk-1/base.apk
chmod
755 /data/app/com.topjohnwu.magisk-1
chmod
644 /data/app/com.topjohnwu.magisk-1/base.apk
chcon
u:object_r:apk_data_file:s0 /data/app/com.topjohnwu.magisk-1
chcon
u:object_r:apk_data_file:s0 /data/app/com.topjohnwu.magisk-1/base.apk
fi
rm
-f
$DATABIN
/magisk.apk 2>/dev/null
fi
# Image merging
# Image merging
chmod
644
$IMG
/cache/magisk.img /data/magisk_merge.img 2>/dev/null
chmod
644
$IMG
/cache/magisk.img /data/magisk_merge.img 2>/dev/null
merge_image /cache/magisk.img
merge_image /cache/magisk.img
...
@@ -480,29 +494,6 @@ case $1 in
...
@@ -480,29 +494,6 @@ case $1 in
bind_mount
"
$ORIG
"
"
$TARGET
"
bind_mount
"
$ORIG
"
"
$TARGET
"
done
done
# Bind hosts for Adblock apps
if
[
-f
$COREDIR
/hosts
]
;
then
log_print
"* Enabling systemless hosts file support"
bind_mount
$COREDIR
/hosts /system/etc/hosts
fi
if
[
-f
$DATABIN
/magisk.apk
]
;
then
if
!
ls
/data/app |
grep
com.topjohnwu.magisk
;
then
mkdir
/data/app/com.topjohnwu.magisk-1
cp
$DATABIN
/magisk.apk /data/app/com.topjohnwu.magisk-1/base.apk
chown
1000.1000 /data/app/com.topjohnwu.magisk-1
chown
1000.1000 /data/app/com.topjohnwu.magisk-1/base.apk
chmod
755 /data/app/com.topjohnwu.magisk-1
chmod
644 /data/app/com.topjohnwu.magisk-1/base.apk
chcon
u:object_r:apk_data_file:s0 /data/app/com.topjohnwu.magisk-1
chcon
u:object_r:apk_data_file:s0 /data/app/com.topjohnwu.magisk-1/base.apk
fi
rm
-f
$DATABIN
/magisk.apk 2>/dev/null
fi
# Expose busybox
[
"
`
getprop persist.magisk.busybox
`
"
=
"1"
]
&&
sh /sbin/magic_mask.sh mount_busybox
# Restart post-fs-data if necessary (multirom)
# Restart post-fs-data if necessary (multirom)
$MULTIROM
&&
setprop magisk.restart_pfsd 1
$MULTIROM
&&
setprop magisk.restart_pfsd 1
...
@@ -522,6 +513,14 @@ case $1 in
...
@@ -522,6 +513,14 @@ case $1 in
MAGISK_VERSION_STUB
MAGISK_VERSION_STUB
log_print
"** Magisk late_start service mode running..."
log_print
"** Magisk late_start service mode running..."
# Bind hosts for Adblock apps
if
[
-f
$COREDIR
/hosts
]
;
then
log_print
"* Enabling systemless hosts file support"
bind_mount
$COREDIR
/hosts /system/etc/hosts
fi
# Expose busybox
[
"
`
getprop persist.magisk.busybox
`
"
=
"1"
]
&&
sh /sbin/magic_mask.sh mount_busybox
# Live patch sepolicy
# Live patch sepolicy
$MAGISKBIN
/magiskpolicy
--live
--magisk
$MAGISKBIN
/magiskpolicy
--live
--magisk
...
@@ -545,7 +544,10 @@ case $1 in
...
@@ -545,7 +544,10 @@ case $1 in
general_scripts service
general_scripts service
# Start MagiskHide
# Start MagiskHide
[
"
`
getprop persist.magisk.hide
`
"
=
"1"
]
&&
sh
$COREDIR
/magiskhide/enable
if
[
"
`
getprop persist.magisk.hide
`
"
=
"1"
]
;
then
log_print
"* Starting MagiskHide"
sh
$COREDIR
/magiskhide/enable
fi
if
[
-f
$DISABLEFILE
]
;
then
if
[
-f
$DISABLEFILE
]
;
then
# Let MagiskManager know
# Let MagiskManager know
...
...
zip_static/common/magiskhide/enable
View file @
81d054a5
...
@@ -32,10 +32,10 @@ log_print "Removing dangerous read-only system props"
...
@@ -32,10 +32,10 @@ log_print "Removing dangerous read-only system props"
VERIFYBOOT
=
`
getprop ro.boot.verifiedbootstate
`
VERIFYBOOT
=
`
getprop ro.boot.verifiedbootstate
`
FLASHLOCKED
=
`
getprop ro.boot.flash.locked
`
FLASHLOCKED
=
`
getprop ro.boot.flash.locked
`
VERITYMODE
=
`
getprop ro.boot.veritymode
`
VERITYMODE
=
`
getprop ro.boot.veritymode
`
KNOX1
=
`
getprop ro.boot.warranty_bit
`
KNOX2
=
`
getprop ro.warranty_bit
`
DEBUGGABLE
=
`
getprop ro.debuggable
`
DEBUGGABLE
=
`
getprop ro.debuggable
`
SECURE
=
`
getprop ro.secure
`
SECURE
=
`
getprop ro.secure
`
BUILDTYPE
=
`
getprop ro.build.type
`
BUILDTAGS
=
`
getprop ro.build.tags
`
[
!
-z
"
$VERIFYBOOT
"
-a
"
$VERIFYBOOT
"
!=
"green"
]
&&
\
[
!
-z
"
$VERIFYBOOT
"
-a
"
$VERIFYBOOT
"
!=
"green"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.verifiedbootstate green
`
"
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.verifiedbootstate green
`
"
...
@@ -43,14 +43,14 @@ log_print "`$BINPATH/resetprop -v -n ro.boot.verifiedbootstate green`"
...
@@ -43,14 +43,14 @@ log_print "`$BINPATH/resetprop -v -n ro.boot.verifiedbootstate green`"
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.flash.locked 1
`
"
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.flash.locked 1
`
"
[
!
-z
"
$VERITYMODE
"
-a
"
$VERITYMODE
"
!=
"enforcing"
]
&&
\
[
!
-z
"
$VERITYMODE
"
-a
"
$VERITYMODE
"
!=
"enforcing"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.veritymode enforcing
`
"
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.veritymode enforcing
`
"
[
!
-z
"
$KNOX1
"
-a
"
$KNOX1
"
!=
"0"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.boot.warranty_bit 0
`
"
[
!
-z
"
$KNOX2
"
-a
"
$KNOX2
"
!=
"0"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.warranty_bit 0
`
"
[
!
-z
"
$DEBUGGABLE
"
-a
"
$DEBUGGABLE
"
!=
"0"
]
&&
\
[
!
-z
"
$DEBUGGABLE
"
-a
"
$DEBUGGABLE
"
!=
"0"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.debuggable 0
`
"
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.debuggable 0
`
"
[
!
-z
"
$SECURE
"
-a
"
$SECURE
"
!=
"1"
]
&&
\
[
!
-z
"
$SECURE
"
-a
"
$SECURE
"
!=
"1"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.secure 1
`
"
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.secure 1
`
"
[
!
-z
"
$BUILDTYPE
"
-a
"
$BUILDTYPE
"
!=
"user"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.build.type user
`
"
[
!
-z
"
$BUILDTAGS
"
-a
"
$BUILDTAGS
"
!=
"release-keys"
]
&&
\
log_print
"
`
$BINPATH
/resetprop
-v
-n
ro.build.tags release-keys
`
"
touch
$MODDIR
/hidelist
touch
$MODDIR
/hidelist
chmod
-R
755
$MODDIR
chmod
-R
755
$MODDIR
...
@@ -65,4 +65,4 @@ while read PROCESS; do
...
@@ -65,4 +65,4 @@ while read PROCESS; do
done
<
$MODDIR
/hidelist
done
<
$MODDIR
/hidelist
log_print
"Starting MagiskHide daemon"
log_print
"Starting MagiskHide daemon"
$BINPATH
/magiskhide
--daemon
(
$BINPATH
/magiskhide
--daemon
)
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