br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add sbin overlay to system-as-root

Browse Source
This commit is contained in:
topjohnwu
2019-06-24 01:21:33 -07:00
parent 9ec8bc2166
commit a1a1ac0bbb
6 changed files with 100 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/jni/init/early_mount.cpp
+5 -5
View File
@@ -53,7 +53,7 @@ static void collect_devices() {
closedir(dir);
}
static void setup_block(const char *partname, char *block_dev = nullptr) {
static dev_t setup_block(const char *partname, char *block_dev = nullptr) {
if (dev_list.empty())
collect_devices();
for (;;) {
@@ -65,9 +65,9 @@ static void setup_block(const char *partname, char *block_dev = nullptr) {
xmkdir("/dev/block", 0755);
}
LOGD("Found %s: [%s] (%d, %d)\n", dev.partname, dev.devname, dev.major, dev.minor);
mknod(block_dev ? block_dev : "/dev/root", S_IFBLK | 0600,
makedev(dev.major, dev.minor));
return;
dev_t rdev = makedev(dev.major, dev.minor);
mknod(block_dev ? block_dev : "/dev/root", S_IFBLK | 0600, rdev);
return rdev;
}
}
// Wait 10ms and try again
@@ -174,7 +174,7 @@ void SARInit::early_mount() {
LOGD("Early mount system_root\n");
sprintf(partname, "system%s", cmd->slot);
setup_block(partname);
system_dev = setup_block(partname);
xmkdir("/system_root", 0755);
if (xmount("/dev/root", "/system_root", "ext4", MS_RDONLY, nullptr))
xmount("/dev/root", "/system_root", "erofs", MS_RDONLY, nullptr);