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
01a12134
Commit
01a12134
authored
Mar 17, 2022
by
vvb2060
Committed by
John Wu
Apr 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
/data/adb/magisk/magisk.apk no longer exists
parent
f0fbd921
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
29 deletions
+9
-29
bootstages.cpp
native/jni/core/bootstages.cpp
+5
-21
magisk.hpp
native/jni/include/magisk.hpp
+0
-1
util_functions.sh
scripts/util_functions.sh
+4
-7
No files found.
native/jni/core/bootstages.cpp
View file @
01a12134
...
...
@@ -131,7 +131,7 @@ static bool magisk_env() {
// Alternative binaries paths
const
char
*
alt_bin
[]
=
{
"/cache/data_adb/magisk"
,
"/data/magisk"
,
buf
};
for
(
auto
alt
:
alt_bin
)
{
struct
stat
st
;
struct
stat
st
{}
;
if
(
lstat
(
alt
,
&
st
)
==
0
)
{
if
(
S_ISLNK
(
st
.
st_mode
))
{
unlink
(
alt
);
...
...
@@ -143,15 +143,7 @@ static bool magisk_env() {
break
;
}
}
// Remove stuffs
rm_rf
(
"/cache/data_adb"
);
rm_rf
(
"/data/adb/modules/.core"
);
unlink
(
"/data/adb/magisk.img"
);
unlink
(
"/data/adb/magisk_merge.img"
);
unlink
(
"/data/magisk.img"
);
unlink
(
"/data/magisk_merge.img"
);
unlink
(
"/data/magisk_debug.log"
);
// Directories in /data/adb
xmkdir
(
DATABIN
,
0755
);
...
...
@@ -379,17 +371,9 @@ void boot_complete(int client) {
xmkdir
(
SECURE_DIR
,
0700
);
if
(
!
get_manager
())
{
if
(
access
(
MANAGERAPK
,
F_OK
)
==
0
)
{
// Only try to install APK when no manager is installed
// Magisk Manager should be upgraded by itself, not through recovery installs
rename
(
MANAGERAPK
,
"/data/magisk.apk"
);
install_apk
(
"/data/magisk.apk"
);
}
else
{
// Install stub
auto
init
=
MAGISKTMP
+
"/magiskinit"
;
exec_command_sync
(
init
.
data
(),
"-x"
,
"manager"
,
"/data/magisk.apk"
);
install_apk
(
"/data/magisk.apk"
);
}
// Install stub
auto
init
=
MAGISKTMP
+
"/magiskinit"
;
exec_command_sync
(
init
.
data
(),
"-x"
,
"manager"
,
"/data/magisk.apk"
);
install_apk
(
"/data/magisk.apk"
);
}
unlink
(
MANAGERAPK
);
}
native/jni/include/magisk.hpp
View file @
01a12134
...
...
@@ -13,7 +13,6 @@
#define MODULEUPGRADE SECURE_DIR "/modules_update"
#define DATABIN SECURE_DIR "/magisk"
#define MAGISKDB SECURE_DIR "/magisk.db"
#define MANAGERAPK DATABIN "/magisk.apk"
// tmpfs paths
extern
std
::
string
MAGISKTMP
;
...
...
scripts/util_functions.sh
View file @
01a12134
...
...
@@ -577,16 +577,13 @@ check_data() {
find_magisk_apk
()
{
local
DBAPK
[
-z
$APK
]
&&
APK
=
$NVBASE
/magisk.apk
[
-f
$APK
]
||
APK
=
$MAGISKBIN
/magisk.apk
[
-f
$APK
]
||
APK
=
/data/app/com.topjohnwu.magisk
*
/
*
.apk
[
-f
$APK
]
||
APK
=
/data/app/
*
/com.topjohnwu.magisk
*
/
*
.apk
[
-z
$APK
]
&&
APK
=
/data/app/com.topjohnwu.magisk
*
/base.apk
[
-f
$APK
]
||
APK
=
/data/app/
*
/com.topjohnwu.magisk
*
/base.apk
if
[
!
-f
$APK
]
;
then
DBAPK
=
$(
magisk
--sqlite
"SELECT value FROM strings WHERE key='requester'"
2>/dev/null |
cut
-d
=
-f2
)
[
-z
$DBAPK
]
&&
DBAPK
=
$(
strings
$NVBASE
/magisk.db |
grep
-oE
'requester..*'
|
cut
-c10-
)
[
-z
$DBAPK
]
||
APK
=
/data/user_de/
*
/
$DBAPK
/dyn/
*
.apk
[
-f
$APK
]
||
[
-z
$DBAPK
]
||
APK
=
/data/app/
$DBAPK
*
/
*
.apk
[
-f
$APK
]
||
[
-z
$DBAPK
]
||
APK
=
/data/app/
*
/
$DBAPK
*
/
*
.apk
[
-z
$DBAPK
]
||
APK
=
/data/user_de/0/
$DBAPK
/dyn/current.apk
[
-f
$APK
]
||
[
-z
$DBAPK
]
||
APK
=
/data/data/
$DBAPK
/dyn/current.apk
fi
[
-f
$APK
]
||
ui_print
"! Unable to detect Magisk app APK for BootSigner"
}
...
...
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