From 8251173b76f6c8a91adafc4d2cf8749649a68c9c Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 1 Jan 2011 17:54:33 +0100
Subject: [PATCH] collectd: start after ntpd.

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

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index fd20d068ee..6995d5b550 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 11ea8ac260..e30a0e00d3 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 78840563c9..c9e70608a9 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)
-- 
2.39.2