collectd: start after ntpd.

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index fd20d068eec863d4d6d44e925716fda5a0f1e0a1..6995d5b55091994176b10c83019fb95950b339f0 100644 (file)
--- 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 11ea8ac260d7e6723a9515eda1990a9ed0cc4628..e30a0e00d3ebc72bdff795ee6d2648c1a9918016 100644 (file)
--- 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 78840563c9b10fab419c3a858b04539834f443b5..c9e70608a99144fbb66d2dfb04c9a2c33b3878cd 100644 (file)
--- 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)