[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15eb7e0a7f984482b8a8ec58131c8797dfe7537a

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1927 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  15eb7e0a7f984482b8a8ec58131c8797dfe7537a (commit)
      from  a832f4f33ef12cd4245b5d50bc98b05db2dae2ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 15eb7e0a7f984482b8a8ec58131c8797dfe7537a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jun 2 10:17:34 2012 +0200

    collectd: fix collectd on machines without rtc.
    
    collectd hangs with 100% cpu usage if there is a very old entry
    in the database. This was created at the first start without internet so
    ntp cannot set the time.

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/init.d/collectd |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index bdb5ca2..544b3e1 100644
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -86,9 +86,14 @@ case "$1" in
 			sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf
 		fi
 
-		boot_mesg "Starting Collection daemon..."
-		/usr/sbin/collectd -C /etc/collectd.conf
-		evaluate_retval
+		if [ $(date +%Y) -gt 2011 ]; then
+			boot_mesg "Starting Collection daemon..."
+			/usr/sbin/collectd -C /etc/collectd.conf
+			evaluate_retval
+		else
+			boot_mesg "collectd: cannot start with incorrect time ($(date))."
+			echo_warning;
+		fi
 		;;
 	stop)
 		boot_mesg "Stopping Collection daemon..."


hooks/post-receive
--
IPFire 2.x development tree