X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=cronie.init;h=10d19270d37dcf89a6229cd1b2231b42b03c1b27;hb=dd40ae0aaf2cbbcf31faf350e1854d752ec3fe74;hp=80ff87cc506b9bbb6acf11d80498050050f9791a;hpb=ae05e276dca42d71f5a08458c075b0ac6e07c873;p=packages%2Fcronie.git

diff --git a/cronie.init b/cronie.init
index 80ff87c..10d1927 100644
--- a/cronie.init
+++ b/cronie.init
@@ -16,6 +16,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+CROND_ARGS=""
+
 # Get service config
 [ -f /etc/sysconfig/cron ] && . /etc/sysconfig/cron
 
@@ -26,8 +28,17 @@ start() {
 		return
 	fi
 
+	if is_yes "$CROND_SYSLOG_RESULT"; then
+		CROND_ARGS="$CROND_ARGS -s"
+	fi
+
+	if [ -n "$CROND_MAIL_PROG" ]; then
+		# XXX: should we handle spaces in $CROND_MAIL_PROG?
+		CROND_ARGS="$CROND_ARGS -m $CROND_MAIL_PROG"
+	fi
+
 	msg_starting "cronie crond"
-	daemon /usr/sbin/crond
+	daemon /usr/sbin/crond $CROND_ARGS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/crond
 }
@@ -66,6 +77,8 @@ condrestart() {
 	start
 }
 
+upstart_controlled
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -86,7 +99,7 @@ case "$1" in
   	reload
 	;;
   status)
-	status crond
+	status --pidfile /var/run/crond.pid crond
 	exit $?
 	;;
   *)