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, master has been updated via 8251173b76f6c8a91adafc4d2cf8749649a68c9c (commit) from b307417f30eeafb088001956ad9416b3244e6691 (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 8251173b76f6c8a91adafc4d2cf8749649a68c9c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 1 17:54:33 2011 +0100

collectd: start after ntpd.

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

Summary of changes: config/rootfiles/common/collectd | 2 +- config/rootfiles/core/44/update.sh | 6 ++++++ lfs/collectd | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index fd20d06..6995d5b 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -3,7 +3,7 @@ etc/collectd.custom etc/collectd.precache etc/collectd.thermal etc/rc.d/rc0.d/K50collectd -etc/rc.d/rc3.d/S21collectd +etc/rc.d/rc3.d/S29collectd etc/rc.d/rc6.d/K50collectd #usr/bin/collectd-nagios #usr/etc/collectd.conf diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index 11ea8ac..e30a0e0 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -103,6 +103,12 @@ echo Unpack the updated files ... tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ --no-overwrite-dir

+# +# Change collectd init symlinks +# +rm -f /etc/rc.d/rc3.d/S21collectd +ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd + # Remove old pakfire cronjob. rm -f /etc/fcron.daily/pakfire-update

diff --git a/lfs/collectd b/lfs/collectd index 7884056..c9e7060 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -91,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd - ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S21collectd + ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd @rm -rf $(DIR_APP) @$(POSTBUILD)

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