Delay mounting sbin overlay

This commit is contained in:
topjohnwu
2019-06-22 03:14:33 -07:00
parent 120bd6cd68
commit cfec0db947
5 changed files with 131 additions and 75 deletions

View File

@ -14,9 +14,18 @@ struct raw_data {
class BaseInit {
protected:
cmdline *cmd;
raw_data self{};
raw_data config{};
char **argv;
void re_exec_init();
virtual void cleanup();
public:
BaseInit(char *argv[], cmdline *cmd) : cmd(cmd), argv(argv) {}
virtual ~BaseInit() = default;
virtual void start() = 0;
};
class MagiskInit : public BaseInit {
protected:
raw_data self{};
int root = -1;
bool load_sepol = false;
bool mnt_system = false;
@ -24,34 +33,31 @@ protected:
bool mnt_product = false;
bool mnt_odm = false;
virtual void preset() {};
virtual void early_mount() {}
virtual void preset() = 0;
virtual void early_mount() = 0;
void setup_rootfs();
bool read_dt_fstab(const char *name, char *partname, char *fstype);
bool patch_sepolicy();
void cleanup();
void re_exec_init();
void cleanup() override;
public:
BaseInit(char *argv[], cmdline *cmd) : cmd(cmd), argv(argv) {}
virtual ~BaseInit() = default;
virtual void start();
MagiskInit(char *argv[], cmdline *cmd) : BaseInit(argv, cmd) {};
void start() override;
};
class LegacyInit : public BaseInit {
class LegacyInit : public MagiskInit {
protected:
void preset() override;
void early_mount() override;
public:
LegacyInit(char *argv[], cmdline *cmd) : BaseInit(argv, cmd) {};
LegacyInit(char *argv[], cmdline *cmd) : MagiskInit(argv, cmd) {};
};
class SARInit : public BaseInit {
class SARInit : public MagiskInit {
protected:
void preset() override;
void early_mount() override;
public:
SARInit(char *argv[], cmdline *cmd) : BaseInit(argv, cmd) {};
SARInit(char *argv[], cmdline *cmd) : MagiskInit(argv, cmd) {};
};
static inline bool is_lnk(const char *name) {
@ -63,3 +69,4 @@ static inline bool is_lnk(const char *name) {
void load_kernel_info(cmdline *cmd);
int dump_magisk(const char *path, mode_t mode);
int magisk_proxy_main(int argc, char *argv[]);