From 4a212dba351bf94a1373e20e49519725383f1d7a Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 25 Jun 2019 02:47:16 -0700
Subject: [PATCH] Early mount partitions in SAR

---
 native/jni/init/early_mount.cpp | 11 ++++++++++-
 native/jni/init/init.cpp        |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/native/jni/init/early_mount.cpp b/native/jni/init/early_mount.cpp
index 2826b97ef..020ef7a24 100644
--- a/native/jni/init/early_mount.cpp
+++ b/native/jni/init/early_mount.cpp
@@ -175,6 +175,8 @@ static void switch_root(const string &path) {
 
 void SARInit::early_mount() {
 	char partname[32];
+	char fstype[32];
+	char block_dev[64];
 
 	full_read("/init", &self.buf, &self.sz);
 	full_read("/.backup/.magisk", &config.buf, &config.sz);
@@ -191,6 +193,13 @@ void SARInit::early_mount() {
 	if (xmount("/dev/root", "/system_root", "ext4", MS_RDONLY, nullptr))
 		xmount("/dev/root", "/system_root", "erofs", MS_RDONLY, nullptr);
 	switch_root("/system_root");
+
+	// Make dev writable
+	xmount("tmpfs", "/dev", "tmpfs", 0, "mode=755");
+
+	mount_root(vendor);
+	mount_root(product);
+	mount_root(odm);
 }
 
 #define umount_root(name) \
@@ -198,8 +207,8 @@ if (mnt_##name) \
 	umount("/" #name);
 
 void MagiskInit::cleanup() {
-	BaseInit::cleanup();
 	umount(SELINUX_MNT);
+	BaseInit::cleanup();
 	umount_root(system);
 	umount_root(vendor);
 	umount_root(product);
diff --git a/native/jni/init/init.cpp b/native/jni/init/init.cpp
index 7d3df0d1d..c96de8e03 100644
--- a/native/jni/init/init.cpp
+++ b/native/jni/init/init.cpp
@@ -115,6 +115,7 @@ static int dump_manager(const char *path, mode_t mode) {
 void BaseInit::cleanup() {
 	umount("/sys");
 	umount("/proc");
+	umount("/dev");
 }
 
 void BaseInit::re_exec_init() {