TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-30 13:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load fstab from system/etc

Browse Source 
Caused by this commit: e98afa2687

Fix #5057
This commit is contained in:
LoveSy 2021-12-14 13:56:00 +08:00 committed by John Wu
parent a7c156a9e3
commit 56eb1a1cf9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
native/jni/init/twostage.cpp
View File

@ -58,6 +58,7 @@ static void read_fstab_file(const char *fstab_file, vector<fstab_entry> &fstab)
extern uint32_t patch_verity(void *buf, uint32_t size); extern uint32_t patch_verity(void *buf, uint32_t size);
void FirstStageInit::prepare() { void FirstStageInit::prepare() {
run_finally finally([]{ chdir("/"); });
if (config->force_normal_boot) { if (config->force_normal_boot) {
xmkdirs(FSR "/system/bin", 0755); xmkdirs(FSR "/system/bin", 0755);
rename("/init" /* magiskinit */, FSR "/system/bin/init"); rename("/init" /* magiskinit */, FSR "/system/bin/init");
@ -82,7 +83,7 @@ void FirstStageInit::prepare() {
for (const char *suffix : {config->fstab_suffix, config->hardware, config->hardware_plat }) { for (const char *suffix : {config->fstab_suffix, config->hardware, config->hardware_plat }) {
if (suffix[0] == '\0') if (suffix[0] == '\0')
continue; continue;
for (const char *prefix: { "odm/etc/fstab", "vendor/etc/fstab", "fstab" }) { for (const char *prefix: { "odm/etc/fstab", "vendor/etc/fstab", "system/etc/fstab", "fstab" }) {
sprintf(fstab_file, "%s.%s", prefix, suffix); sprintf(fstab_file, "%s.%s", prefix, suffix);
if (access(fstab_file, F_OK) != 0) { if (access(fstab_file, F_OK) != 0) {
fstab_file[0] = '\0'; fstab_file[0] = '\0';
@ -126,6 +127,10 @@ exit_loop:
auto init = mmap_data("/init", true); auto init = mmap_data("/init", true);
init.patch({ make_pair("android,fstab", "xxx") }); init.patch({ make_pair("android,fstab", "xxx") });
} else { } else {
if (fstab_file[0] == '\0') {
LOGE("Cannot find fstab");
return;
}
// Parse and load the fstab file // Parse and load the fstab file
read_fstab_file(fstab_file, fstab); read_fstab_file(fstab_file, fstab);
} }
@ -192,8 +197,6 @@ exit_loop:
} }
} }
chmod(fstab_file, 0644); chmod(fstab_file, 0644);
chdir("/");
} }
#define INIT_PATH "/system/bin/init" #define INIT_PATH "/system/bin/init"