TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-24 18:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Pixel 2 XL support

Browse Source
This commit is contained in:
topjohnwu 2017-11-06 22:33:41 +08:00
parent e710848345
commit 2db60e0a6b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jni/init/magiskinit.c
View File

@ -35,6 +35,9 @@
#include "utils.h" #include "utils.h"
#include "magiskpolicy.h" #include "magiskpolicy.h"
// #define VLOG(fmt, ...) printf(fmt, __VA_ARGS__) /* Enable to debug */
#define VLOG(fmt, ...)
struct cmdline { struct cmdline {
int skip_initramfs; int skip_initramfs;
char slot[3]; char slot[3];
@ -66,6 +69,9 @@ static void parse_cmdline(struct cmdline *cmd) {
while (tok != NULL) { while (tok != NULL) {
if (strncmp(tok, "androidboot.slot_suffix", 23) == 0) { if (strncmp(tok, "androidboot.slot_suffix", 23) == 0) {
sscanf(tok, "androidboot.slot_suffix=%s", cmd->slot); sscanf(tok, "androidboot.slot_suffix=%s", cmd->slot);
} else if (strncmp(tok, "androidboot.slot", 16) == 0) {
cmd->slot[0] = '_';
sscanf(tok, "androidboot.slot=%s", cmd->slot + 1);
} else if (strcmp(tok, "skip_initramfs") == 0) { } else if (strcmp(tok, "skip_initramfs") == 0) {
cmd->skip_initramfs = 1; cmd->skip_initramfs = 1;
} }
@ -74,6 +80,7 @@ static void parse_cmdline(struct cmdline *cmd) {
} }
static void parse_device(struct device *dev, char *uevent) { static void parse_device(struct device *dev, char *uevent) {
dev->partname[0] = '\0';
char *tok; char *tok;
tok = strtok(uevent, "\n"); tok = strtok(uevent, "\n");
while (tok != NULL) { while (tok != NULL) {
@ -88,6 +95,7 @@ static void parse_device(struct device *dev, char *uevent) {
} }
tok = strtok(NULL, "\n"); tok = strtok(NULL, "\n");
} }
VLOG("%s [%s] (%u, %u)\n", dev->devname, dev->partname, (unsigned) dev->major, (unsigned) dev->minor);
} }
static int setup_block(struct device *dev, const char *partname) { static int setup_block(struct device *dev, const char *partname) {
@ -293,6 +301,8 @@ int main(int argc, char *argv[]) {
struct cmdline cmd; struct cmdline cmd;
parse_cmdline(&cmd); parse_cmdline(&cmd);
VLOG("cmdline: skip_initramfs=[%d] slot_suffix=[%s]\n", cmd.skip_initramfs, cmd.slot);
int root = open("/", O_RDONLY | O_CLOEXEC); int root = open("/", O_RDONLY | O_CLOEXEC);
if (cmd.skip_initramfs) { if (cmd.skip_initramfs) {