mirror of
https://github.com/topjohnwu/Magisk.git
synced 2025-12-08 16:16:26 +00:00
Small magiskinit cleanup
This commit is contained in:
@@ -31,9 +31,9 @@ struct raw_data {
|
||||
}
|
||||
};
|
||||
|
||||
/* *************
|
||||
/***************
|
||||
* Base classes
|
||||
* *************/
|
||||
***************/
|
||||
|
||||
class BaseInit {
|
||||
protected:
|
||||
@@ -41,9 +41,9 @@ protected:
|
||||
char **argv;
|
||||
std::vector<std::string> mount_list;
|
||||
|
||||
void exec_init(const char *init = "/init") {
|
||||
void exec_init() {
|
||||
cleanup();
|
||||
execv(init, argv);
|
||||
execv("/init", argv);
|
||||
exit(1);
|
||||
}
|
||||
virtual void cleanup();
|
||||
@@ -60,7 +60,7 @@ protected:
|
||||
std::string persist_dir;
|
||||
|
||||
virtual void early_mount() = 0;
|
||||
bool patch_sepolicy(const char *file = "/sepolicy");
|
||||
bool patch_sepolicy(const char *file);
|
||||
public:
|
||||
MagiskInit(char *argv[], cmdline *cmd) : BaseInit(argv, cmd) {}
|
||||
};
|
||||
@@ -82,22 +82,9 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
/* *************
|
||||
/***************
|
||||
* 2 Stage Init
|
||||
* *************/
|
||||
|
||||
class ForcedFirstStageInit : public BaseInit {
|
||||
private:
|
||||
void prepare();
|
||||
public:
|
||||
ForcedFirstStageInit(char *argv[], cmdline *cmd) : BaseInit(argv, cmd) {
|
||||
LOGD("%s\n", __FUNCTION__);
|
||||
};
|
||||
void start() override {
|
||||
prepare();
|
||||
exec_init("/system/bin/init");
|
||||
}
|
||||
};
|
||||
***************/
|
||||
|
||||
class FirstStageInit : public BaseInit {
|
||||
private:
|
||||
@@ -137,9 +124,9 @@ public:
|
||||
};
|
||||
};
|
||||
|
||||
/* ***********
|
||||
/*************
|
||||
* Legacy SAR
|
||||
* ***********/
|
||||
*************/
|
||||
|
||||
class SARInit : public SARBase {
|
||||
protected:
|
||||
@@ -150,9 +137,9 @@ public:
|
||||
};
|
||||
};
|
||||
|
||||
/* **********
|
||||
/************
|
||||
* Initramfs
|
||||
* **********/
|
||||
************/
|
||||
|
||||
class RootFSInit : public MagiskInit {
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user