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
d149af96
Commit
d149af96
authored
Jul 01, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bootloop when upgrading from older Magisk
parent
c0ac2d54
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
build.py
build.py
+1
-1
bootstages.c
native/jni/core/bootstages.c
+2
-1
addon.d.sh
scripts/addon.d.sh
+1
-1
flash_script.sh
scripts/flash_script.sh
+1
-1
No files found.
build.py
View file @
d149af96
...
...
@@ -106,7 +106,7 @@ def build_binary(args):
header
(
'* Building binaries: '
+
' '
.
join
(
targets
))
# Force update logging.h timestamp to trigger recompilation for the flags to make a difference
os
.
utime
(
os
.
path
.
join
(
'native'
,
'jni'
,
'include'
,
'logging.h'
))
# Basic flags
base_flags
=
'MAGISK_VERSION=
\"
{}
\"
MAGISK_VER_CODE={} MAGISK_DEBUG={}'
.
format
(
config
[
'version'
],
config
[
'versionCode'
],
...
...
native/jni/core/bootstages.c
View file @
d149af96
...
...
@@ -585,7 +585,7 @@ void startup() {
close
(
root
);
// Alternative binaries paths
char
*
alt_bin
[]
=
{
"/cache/data_bin"
,
"/data/magisk"
,
char
*
alt_bin
[]
=
{
"/cache/data_bin"
,
"/data/
.
magisk"
,
"/data/data/com.topjohnwu.magisk/install"
,
"/data/user_de/0/com.topjohnwu.magisk/install"
,
NULL
};
char
*
bin_path
=
NULL
;
...
...
@@ -602,6 +602,7 @@ void startup() {
}
// Remove legacy stuffs
rm_rf
(
"/data/magisk"
);
unlink
(
"/data/magisk.img"
);
unlink
(
"/data/magisk_debug.log"
);
...
...
scripts/addon.d.sh
View file @
d149af96
...
...
@@ -27,7 +27,7 @@ initialize() {
.
$MAGISKBIN
/util_functions.sh
APK
=
/data/adb/magisk.apk
[
-f
$APK
]
||
APK
=
/data/magisk/magisk.apk
[
-f
$APK
]
||
APK
=
/data/
.
magisk/magisk.apk
[
-f
$APK
]
||
APK
=
/data/app/com.topjohnwu.magisk
*
/
*
.apk
}
...
...
scripts/flash_script.sh
View file @
d149af96
...
...
@@ -79,7 +79,7 @@ ui_print "- Constructing environment"
check_data
if
$DATA
;
then
MAGISKBIN
=
/data/magisk
MAGISKBIN
=
/data/
.
magisk
$DATA_DE
&&
MAGISKBIN
=
/data/adb/magisk
run_migrations
else
...
...
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