Fixed collectd rc.d links

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1176 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/7/files b/config/rootfiles/core/7/files
index 6b63a14100ee72ea7ac987be6063bdecada8bee5..2d5c0a0c0c8e14e38dc2bf639024c840192b5321 100644 (file)
--- a/config/rootfiles/core/7/files
+++ b/config/rootfiles/core/7/files
@@ -1,5 +1,8 @@
 etc/collectd.conf
 etc/init.d/collectd
+etc/rc.d/rc0.d/K50collectd
+etc/rc.d/rc3.d/S20collectd
+etc/rc.d/rc6.d/K50collectd
 srv/web/ipfire/cgi-bin/graphs.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/network.cgi

diff --git a/config/rootfiles/core/7/update.sh b/config/rootfiles/core/7/update.sh
index 14eea1693f7bb17be9329d8b12c8c116efdf731f..e03f92d1ea706af53b06ac47583560fef9629b33 100644 (file)
--- a/config/rootfiles/core/7/update.sh
+++ b/config/rootfiles/core/7/update.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 . /opt/pakfire/lib/functions.sh
 extract_files
-ln -s /etc/rc.d/rc0.d/K50collectd /etc/init.d/collectd
-ln -s /etc/rc.d/rc3.d/S20collectd /etc/init.d/collectd
-ln -s /etc/rc.d/rc6.d/K50collectd /etc/init.d/collectd
 GATEWAY=$(cat /var/ipfire/red/remote-ipaddress)
 echo "$GATEWAY gateway" >> /etc/hosts
 /etc/init.d/collectd start

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 8e75ea542668cf673f05f2957a6cbe14cdec2e28..b778b17a56b74955524d913da63db6d22764c675 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -64,6 +64,7 @@
 * dhcp-3.1.0
 * dhcpcd-2.0.8
 * diffutils-2.8.1
+* dm9601-1.01
 * dnsmasq-2.40
 * dosfstools-2.11
 * e2fsprogs-1.39
@@ -170,7 +171,6 @@
 * mldonkey-2.9.2
 * module-init-tools-3.2.2
 * mpc-0.12.1
-* mpd-0.13.0
 * mpd-0.13.1
 * mpeg2dec-0.4.0b
 * mpfire-ipfire

diff --git a/lfs/collectd b/lfs/collectd
index 72c4829c7b965986487d4933f768eac311447b88..1794b5c63507f5db60f143dc5c84e8ae644c68a2 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -87,5 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-rrdtool=/usr/share/rrdtool-1.2.15 --enable-debug
        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/rc6.d/K50collectd 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)