Change collectd symlink to be started after network

diff --git a/config/rootfiles/updater/filelists/collectd b/config/rootfiles/updater/filelists/collectd
index 7cbd345e96d83c00a360c881eb4a11d7f85c3971..2e248e01167dd9d5b1f91fc71306a471ce0ac909 100644 (file)
--- a/config/rootfiles/updater/filelists/collectd
+++ b/config/rootfiles/updater/filelists/collectd
@@ -1,6 +1,6 @@
 etc/collectd.conf
 etc/rc.d/rc0.d/K50collectd
-etc/rc.d/rc3.d/S20collectd
+etc/rc.d/rc3.d/S21collectd
 etc/rc.d/rc6.d/K50collectd
 etc/rc.d/init.d/collectd
 #usr/bin/collectd-nagios

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index e0b96a64d382357e620a7d22f2f1abacbf4dce35..526e89d2579c7bc560bd3557d2cdbfe632467d9e 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -54,6 +54,10 @@ tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
 echo
 echo Update IPfire to $NEWVERSON ...
 #
+# Delete old collectd symlink
+#
+rm -rf /etc/rc.d/rc3.d/S20collectd
+#
 # Backup the old grub config
 #
 mv /boot/grub/grub.conf /boot/grub/grub-old.conf

diff --git a/lfs/collectd b/lfs/collectd
index 56ccdc10b67f0904fa89de75606242e7f2be87ad..0e35c6c2ed8e9467167783ffae90a5db1ef0fa0c 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
        cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/
        ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd 
-       ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S20collectd
+       ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S21collectd
        ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)