From 72332854379254ea760a5c77f529e7e48955cc81 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 4 Jul 2019 17:58:38 -0700
Subject: [PATCH] Use relative symbolic links

---
 native/jni/core/bootstages.cpp | 8 ++++----
 native/jni/init/rootdir.cpp    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/native/jni/core/bootstages.cpp b/native/jni/core/bootstages.cpp
index e02b7c2b3..dcd124d51 100644
--- a/native/jni/core/bootstages.cpp
+++ b/native/jni/core/bootstages.cpp
@@ -348,8 +348,8 @@ static bool magisk_env() {
 	unlink("/data/magisk_debug.log");
 
 	// Backwards compatibility
-	symlink(MAGISKTMP, "/sbin/.core");
-	symlink(MODULEMNT, MAGISKTMP "/img");
+	symlink("./magisk", "/sbin/.core");
+	symlink("./modules", MAGISKTMP "/img");
 
 	// Directories in tmpfs overlay
 	xmkdir(MIRRDIR, 0);
@@ -663,14 +663,14 @@ void post_fs_data(int client) {
 		if (access(buf, F_OK) == 0) {
 			snprintf(buf2, PATH_MAX, "%s/%s/vendor", MODULEROOT, module);
 			unlink(buf2);
-			xsymlink(buf, buf2);
+			xsymlink("./system/vendor", buf2);
 		}
 		// If /system/product exists in module, create a link outside
 		snprintf(buf, PATH_MAX, "%s/%s/system/product", MODULEROOT, module);
 		if (access(buf, F_OK) == 0) {
 			snprintf(buf2, PATH_MAX, "%s/%s/product", MODULEROOT, module);
 			unlink(buf2);
-			xsymlink(buf, buf2);
+			xsymlink("./system/product", buf2);
 		}
 		sys_root->create_module_tree(module);
 	}
diff --git a/native/jni/init/rootdir.cpp b/native/jni/init/rootdir.cpp
index 83167f3f9..5b871516c 100644
--- a/native/jni/init/rootdir.cpp
+++ b/native/jni/init/rootdir.cpp
@@ -185,10 +185,10 @@ static void sbin_overlay(const raw_data &self, const raw_data &config) {
 	char path[64];
 	for (int i = 0; applet_names[i]; ++i) {
 		sprintf(path, "/sbin/%s", applet_names[i]);
-		xsymlink("/sbin/magisk", path);
+		xsymlink("./magisk", path);
 	}
-	xsymlink("/sbin/magiskinit", "/sbin/magiskpolicy");
-	xsymlink("/sbin/magiskinit", "/sbin/supolicy");
+	xsymlink("./magiskinit", "/sbin/magiskpolicy");
+	xsymlink("./magiskinit", "/sbin/supolicy");
 }
 
 #define ROOTMIR MIRRDIR "/system_root"