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
b1dbbdef
Commit
b1dbbdef
authored
Jan 25, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unneeded busybox redirection
parent
3e479726
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
18 deletions
+3
-18
bootstages.cpp
native/jni/core/bootstages.cpp
+3
-18
No files found.
native/jni/core/bootstages.cpp
View file @
b1dbbdef
...
@@ -99,13 +99,6 @@ static void mount_mirrors() {
...
@@ -99,13 +99,6 @@ static void mount_mirrors() {
link_mirror
(
system_ext
)
link_mirror
(
system_ext
)
}
}
constexpr
char
bb_script
[]
=
R"EOF(
#!/system/bin/sh
BB=%s
[ -x $BB ] && exec $BB "$@"
exec /data/adb/magisk/busybox.bin "$@"
)EOF"
;
static
bool
magisk_env
()
{
static
bool
magisk_env
()
{
char
buf
[
4096
];
char
buf
[
4096
];
...
@@ -153,20 +146,12 @@ static bool magisk_env() {
...
@@ -153,20 +146,12 @@ static bool magisk_env() {
unlink
(
"/sbin/magiskhide"
);
unlink
(
"/sbin/magiskhide"
);
}
}
if
(
access
(
DATABIN
"/busybox.bin"
,
X_OK
))
{
if
(
access
(
DATABIN
"/busybox"
,
X_OK
))
if
(
access
(
DATABIN
"/busybox"
,
X_OK
))
return
false
;
return
false
;
rename
(
DATABIN
"/busybox"
,
DATABIN
"/busybox.bin"
);
}
sprintf
(
buf
,
"%s/"
BBPATH
"/busybox"
,
MAGISKTMP
.
data
());
sprintf
(
buf
,
"%s/"
BBPATH
"/busybox"
,
MAGISKTMP
.
data
());
{
auto
fp
=
open_file
(
DATABIN
"/busybox"
,
"we"
);
fprintf
(
fp
.
get
(),
bb_script
,
buf
);
}
chmod
(
DATABIN
"/busybox"
,
0755
);
mkdir
(
dirname
(
buf
),
0755
);
mkdir
(
dirname
(
buf
),
0755
);
cp_afc
(
DATABIN
"/busybox
.bin
"
,
buf
);
cp_afc
(
DATABIN
"/busybox"
,
buf
);
exec_command_async
(
buf
,
"--install"
,
"-s"
,
dirname
(
buf
));
exec_command_async
(
buf
,
"--install"
,
"-s"
,
dirname
(
buf
));
return
true
;
return
true
;
...
...
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