--- net/kafka/files/kafka.in	(revision 503721)
+++ net/kafka/files/kafka.in	(working copy)
@@ -11,8 +11,6 @@ 
 #
 # kafka_user:		Username to run Kafka
 #			Default: %%USERS%%
-# kafka_group:		Groupname to run Kafka
-#			Default: %%GROUPS%%
 # kafka_config:		Configuration file to run Kafka
 #			Default: %%ETCDIR%%/server.properties
 # kafka_log4j_profile:	Profile for Kafka logging
@@ -21,7 +19,7 @@ 
 #			Default: %%KAFKA_LOGDIR%%
 # kafka_java_opts:	Options passed to JVM to start Kafka
 #			Default: None
-# kafka_pid_file:	Full path of the Kafka process PID file
+# kafka_pidfile:	Full path of the Kafka process PID file
 #			Default: %%KAFKA_RUNDIR%%/kafka.pid
 # kafka_syslog_output_enable:		Set to enable syslog output.
 #					Default: YES
@@ -39,16 +37,15 @@ 
 
 : ${kafka_enable:=NO}
 : ${kafka_user:=%%USERS%%}
-: ${kafka_group:=%%GROUPS%%}
 : ${kafka_config:=%%ETCDIR%%/server.properties}
 : ${kafka_log4j_profile:=%%ETCDIR%%/log4j.properties}
 : ${kafka_log_dir:=%%KAFKA_LOGDIR%%}
 : ${kafka_java_opts:=}
-: ${kafka_pid_file:=%%KAFKA_RUNDIR%%/kafka.pid}
+: ${kafka_pidfile:=%%KAFKA_RUNDIR%%/kafka.pid}
 : ${kafka_syslog_output_enable:="YES"}
 
 if checkyesno kafka_syslog_output_enable; then
-	kafka_syslog_output_flags="-t ${name} -T ${name}"
+	kafka_syslog_output_flags="-T ${name}"
 	if [ -n "${kafka_syslog_output_priority}" ]; then
 		kafka_syslog_output_flags="${kafka_syslog_output_flags} -s ${kafka_syslog_output_priority}"
 	fi
@@ -63,21 +60,12 @@ 
 
 kafka_log_opts="-Dkafka.logs.dir=${kafka_log_dir} -Dlog4j.configuration=file:${kafka_log4j_profile}"
 kafka_main="$kafka_java_opts $kafka_log_opts -cp $CLASSPATH"
-pidfile=${kafka_pid_file}
-procname=${JAVA}
+pidfile="${kafka_pidfile}"
+required_dirs="${kafka_log_dir}"
 required_files="${kafka_config} ${kafka_log4j_profile}"
 
-
 command="/usr/sbin/daemon"
-command_args="-f ${kafka_syslog_output_flags} -p ${pidfile} ${JAVA} ${kafka_main} kafka.Kafka ${kafka_config}"
+command_args="-f ${kafka_syslog_output_flags} -P '${pidfile}' -u ${kafka_user} -t ${name} ${JAVA} ${kafka_main} kafka.Kafka ${kafka_config}"
+unset kafka_user
 
-start_precmd="kafka_init"
-
-
-kafka_init()
-{
-	[ -d "$kafka_log_dir" ] || mkdir -p "$kafka_log_dir"
-	chown ${kafka_user}:${kafka_group} ${pidfile%/*} ${kafka_log_dir} ${kafka_config} ${kafka_log4j_profile}
-}
-
 run_rc_command "$1"