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

Improvements to system_root devices booting as recovery

Browse Source
This commit is contained in:
topjohnwu 2018-08-07 02:20:40 +08:00
parent e139f4fc13
commit 9159f86a9e
1 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
native/jni/core/magiskinit.c
View File

@ -357,6 +357,8 @@ int main(int argc, char *argv[]) {
* ***********/ * ***********/
int root = open("/", O_RDONLY | O_CLOEXEC); int root = open("/", O_RDONLY | O_CLOEXEC);
int mnt_system = 0;
int mnt_vendor = 0;
if (cmd.skip_initramfs) { if (cmd.skip_initramfs) {
// Clear rootfs // Clear rootfs
@ -384,12 +386,14 @@ int main(int argc, char *argv[]) {
link("/.backup/init", "/init"); link("/.backup/init", "/init");
} }
// Do not go further if system_root device is booting as recovery
if (!cmd.skip_initramfs && access("/sbin/recovery", F_OK) == 0)
goto exec_init;
/* ************ /* ************
* Early Mount * Early Mount
* ************/ * ************/
int mnt_system = 0;
int mnt_vendor = 0;
struct device dev; struct device dev;
char partname[32]; char partname[32];
@ -423,49 +427,47 @@ int main(int argc, char *argv[]) {
* Ramdisk Patches * Ramdisk Patches
* ****************/ * ****************/
// Only patch rootfs if not intended to run in recovery // Handle ramdisk overlays
if (access("/sbin/recovery", F_OK) != 0) { int fd = open("/overlay", O_RDONLY | O_CLOEXEC);
// Handle ramdisk overlays if (fd >= 0) {
int fd = open("/overlay", O_RDONLY | O_CLOEXEC); mv_dir(fd, root);
if (fd >= 0) {
mv_dir(fd, root);
close(fd);
rmdir("/overlay");
}
// Patch init.rc to load magisk scripts
int injected = 0;
char tok[4096];
FILE *fp = xfopen("/init.rc", "r");
fd = creat("/init.rc.new", 0750);
while(fgets(tok, sizeof(tok), fp)) {
if (!injected && strncmp(tok, "import", 6) == 0) {
if (strstr(tok, "init.magisk.rc")) {
injected = 1;
} else {
xwrite(fd, "import /init.magisk.rc\n", 23);
injected = 1;
}
} else if (strstr(tok, "selinux.reload_policy")) {
// Do not allow sepolicy patch
continue;
}
xwrite(fd, tok, strlen(tok));
}
fclose(fp);
close(fd); close(fd);
rename("/init.rc.new", "/init.rc"); rmdir("/overlay");
// Patch sepolicy
patch_sepolicy();
// Dump binaries
dump_magiskrc("/init.magisk.rc", 0750);
dump_magisk("/sbin/magisk", 0755);
patch_socket_name("/sbin/magisk");
rename("/init.bak", "/sbin/magiskinit");
} }
// Patch init.rc to load magisk scripts
int injected = 0;
char tok[4096];
FILE *fp = xfopen("/init.rc", "r");
fd = creat("/init.rc.new", 0750);
while(fgets(tok, sizeof(tok), fp)) {
if (!injected && strncmp(tok, "import", 6) == 0) {
if (strstr(tok, "init.magisk.rc")) {
injected = 1;
} else {
xwrite(fd, "import /init.magisk.rc\n", 23);
injected = 1;
}
} else if (strstr(tok, "selinux.reload_policy")) {
// Do not allow sepolicy patch
continue;
}
xwrite(fd, tok, strlen(tok));
}
fclose(fp);
close(fd);
rename("/init.rc.new", "/init.rc");
// Patch sepolicy
patch_sepolicy();
// Dump binaries
dump_magiskrc("/init.magisk.rc", 0750);
dump_magisk("/sbin/magisk", 0755);
patch_socket_name("/sbin/magisk");
rename("/init.bak", "/sbin/magiskinit");
exec_init:
// Clean up // Clean up
close(root); close(root);
umount("/proc"); umount("/proc");