TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-28 09:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Init code rearrangement

Browse Source
This commit is contained in:
topjohnwu
2019-06-30 11:39:13 -07:00
parent e8b73ba6d1
commit db8dd9f186
4 changed files with 46 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
native/jni/init/rootdir.cpp
View File

@@ -1,6 +1,5 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mount.h>
#include <fcntl.h>
#include <magisk.h>
@@ -396,19 +395,18 @@ int magisk_proxy_main(int argc, char *argv[]) {
sbin_overlay(self, config);
// Create symlinks pointing back to /root
{
char path[256];
int sbin = xopen("/sbin", O_RDONLY | O_CLOEXEC);
unique_ptr<DIR, decltype(&closedir)> dir(xopendir("/root"), &closedir);
struct dirent *entry;
while((entry = xreaddir(dir.get()))) {
if (entry->d_name == "."sv || entry->d_name == ".."sv)
continue;
sprintf(path, "/root/%s", entry->d_name);
xsymlinkat(path, sbin, entry->d_name);
}
close(sbin);
char path[256];
int sbin = xopen("/sbin", O_RDONLY | O_CLOEXEC);
DIR *dir = xopendir("/root");
struct dirent *entry;
while((entry = xreaddir(dir))) {
if (entry->d_name == "."sv || entry->d_name == ".."sv)
continue;
sprintf(path, "/root/%s", entry->d_name);
xsymlinkat(path, sbin, entry->d_name);
}
close(sbin);
closedir(dir);
setenv("REMOUNT_ROOT", "1", 1);
execv("/sbin/magisk", argv);