From d21264d01b71131a1ec20c4680f0a44df0bdbd25 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 19 Dec 2017 14:27:54 +0800
Subject: [PATCH] Let magiskinit directly spawn new magisk_daemon process

---
 core/jni/core/magiskinit.c  | 2 +-
 core/jni/include/magiskrc.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/jni/core/magiskinit.c b/core/jni/core/magiskinit.c
index 1b9389c12..78a13f95b 100644
--- a/core/jni/core/magiskinit.c
+++ b/core/jni/core/magiskinit.c
@@ -393,7 +393,7 @@ static void magisk_init_daemon() {
 		 * We restart the daemon again */
 		close(fd);
 		if (fork_dont_care() == 0) {
-			execv("/sbin/magisk", (char *[]) { "resetprop", "magisk.daemon", "1", NULL } );
+			execv("/sbin/magisk", (char *[]) { "magisk", "--daemon", NULL } );
 			exit(1);
 		}
 	}
diff --git a/core/jni/include/magiskrc.h b/core/jni/include/magiskrc.h
index 019db19f1..91d7a92e3 100644
--- a/core/jni/include/magiskrc.h
+++ b/core/jni/include/magiskrc.h
@@ -16,10 +16,6 @@ const char magiskrc[] =
 "   rm /dev/.magisk.unblock\n"
 "\n"
 
-"on property:magisk.daemon=1\n"
-"   start magisk_daemon\n"
-"\n"
-
 // Services
 
 "service magisk_daemon /sbin/magisk --daemon\n"