X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsetup.c;h=8ff9c297cae6fa6794dc710e7894b2082fc128b8;hb=0047043f803e4fade3cb26b5b1d13ed40ca75ebb;hp=e5212930ccfbe0435b0932e813c008b4a8565236;hpb=31159b4fd0b03b5367db90710b843ed62c7ad471;p=citadel.git

diff --git a/citadel/setup.c b/citadel/setup.c
index e5212930c..8ff9c297c 100644
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -397,10 +397,14 @@ void install_init_scripts(void)
 			"#\n"
 			"# chkconfig: - 79 30\n"
 			"# description: Citadel service\n"
-			"# processname: ctdlsvc\n"
-			"# pidfile: /var/run/citadel.pid\n"
+			"# processname: citserver\n"
+			"# pidfile: %s/citadel.pid\n"
 			"\n"
-			"CITADEL_DIR=%s\n", setup_directory);
+			"CITADEL_DIR=%s\n"
+			,
+				setup_directory,
+				setup_directory
+			);
 	fprintf(fp,	"\n"
 			"test -x $CITADEL_DIR/ctdlsvc || exit 0\n"
 			"test -d /var/run || exit 0\n"
@@ -408,9 +412,7 @@ void install_init_scripts(void)
 			"case \"$1\" in\n"
 			"\n"
 			"start)		echo -n \"Starting Citadel... \"\n"
-			"		if $CITADEL_DIR/ctdlsvc /var/run/citadel.pid "
-							"$CITADEL_DIR/citserver "
-							"-t/dev/null\n"
+			"		if $CITADEL_DIR/citserver -d\n"
 			"		then\n"
 			"			echo \"ok\"\n"
 			"		else\n"
@@ -423,7 +425,10 @@ void install_init_scripts(void)
 			"		else\n"
 			"			echo \"failed\"\n"
 			"		fi\n"
-			"		rm -f /var/run/citadel.pid 2>/dev/null\n");
+			"		rm -f %s/citadel.pid 2>/dev/null\n"
+			,
+				setup_directory
+			);
 	fprintf(fp,	"		;;\n"
 			"restart)	$0 stop\n"
 			"		$0 start\n"