X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=7f020c8f73f34674a0ff644aa84e73a9096962b1;hp=0cfac60722d825fddb4714dfba651eb8265e770a;hb=25ca796b7f7a4c5a57799cac2998a66ffde2a81a;hpb=ff70d3f74c6116cf5b3c9a6708218788363efa7c

diff --git a/server.c b/server.c
index 0cfac607..7f020c8f 100644
--- a/server.c
+++ b/server.c
@@ -491,10 +491,9 @@ static void server_init(int argc, char **argv)
 	gettimeofday(now, NULL);
 	set_server_start_time(now);
 	init_user_list(user_list_file);
-	init_server_command_task(argc, argv);
 	/* become daemon */
 	if (conf.daemon_given)
-		daemonize();
+		daemonize(true /* parent waits for SIGTERM */);
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
 
@@ -519,6 +518,9 @@ static void server_init(int argc, char **argv)
 	para_unblock_signal(SIGCHLD);
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	init_vss_task(afs_socket);
+	init_server_command_task(argc, argv);
+	if (conf.daemon_given)
+		kill(getppid(), SIGTERM);
 	PARA_NOTICE_LOG("server init complete\n");
 }