launch_daemon: Added "setting" condition.

* Moved the mail_daemon to the user startup, and start it only if enabled in the settings.
2015-11-06 22:49:17 +01:00
parent c2f71fa688
commit d8c0972a81
3 changed files with 89 additions and 6 deletions
@@ -43,12 +43,6 @@ service x-vnd.Haiku-midi_server {
 	on_demand
 }

-service x-vnd.Haiku-mail_daemon {
-	launch /system/servers/mail_daemon -E
-	no_safemode
-	legacy
-}
-
 service x-vnd.Haiku-net_server {
 	launch /system/servers/net_server
 	no_safemode
@@ -16,6 +16,13 @@ target desktop {
 		}
 	}

+	service x-vnd.Haiku-mail_daemon {
+		launch /system/servers/mail_daemon -E
+		if setting ~/config/settings/Mail/new_mail_daemon DaemonAutoStarts
+		no_safemode
+		legacy
+	}
+
 	job user-bootscript {
 		launch /bin/sh ~/config/settings/boot/UserBootscript
 	}