MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unneeded busybox redirection

Browse Source
This commit is contained in:
topjohnwu 2021-01-25 00:23:42 -08:00
parent 3e479726ec
commit b1dbbdef12
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
native/jni/core/bootstages.cpp
View File

@ -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() {
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;