Move vnstat database to /var/log/rrd

Add a tmpfs script to restore the ramdisk before network start and save after

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index f2834313149eb9e3171f1be63fe75a65ff24f8f4..f3ba875a772075a66c89ef57414b0f556c49943b 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -164,3 +164,7 @@ etc/sysconfig/firewall.local
 etc/sysconfig/modules
 etc/sysconfig/rc
 etc/sysconfig/rc.local
+etc/rc.d/init.d/tmpfs
+etc/rc.d/rc0.d/K85tmpfs
+etc/rc.d/rc3.d/S01tmpfs
+etc/rc.d/rc6.d/K85tmpfs

diff --git a/config/rootfiles/common/vnstat b/config/rootfiles/common/vnstat
index 39def7804650a263f23f9642e6a8e473022b51d5..57c54dbef6d63c5c189eb2577091ce0e6567beb1 100644 (file)
--- a/config/rootfiles/common/vnstat
+++ b/config/rootfiles/common/vnstat
@@ -4,4 +4,3 @@ etc/vnstat.conf
 usr/bin/vnstat
 #usr/share/man/man1/vnstat.1
 #var/lib/vnstat
-var/log/vnstat

diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files
index aea3d85528d593d463d3c9716568e7158c3ed551..0c95631da64e6d22e9a9c38c199769fd844565d6 100644 (file)
--- a/config/rootfiles/updater/filelists/files
+++ b/config/rootfiles/updater/filelists/files
@@ -8,6 +8,10 @@ etc/ppp/dialer
 etc/rc.d/init.d/checkfstab
 etc/rc.d/rcsysinit.d/S19checkfstab
 etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/tmpfs
+etc/rc.d/rc0.d/K85tmpfs
+etc/rc.d/rc3.d/S01tmpfs
+etc/rc.d/rc6.d/K85tmpfs
 etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/network
 etc/rc.d/init.d/networking/any

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d35e12979918f1a8660240128be345c0336dcfb5..643e6d41e08432c724fd544722f620294703ee66 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -180,7 +180,7 @@
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * linuxigd-0.95
-* lm_sensors-3.0.2
+* lm_sensors-3.0.3
 * logrotate-3.7.1
 * logwatch-7.3.6
 * lsof-4.78

diff --git a/lfs/initscripts b/lfs/initscripts
index 0249734604300d6d330f3ec11aa4c58886ad4499..345a122e6000c584da7a3155e47d90718d3da5f4 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -129,6 +129,9 @@ $(TARGET) :
        ln -sf ../init.d/beep        /etc/rc.d/rc0.d/K99beep
        ln -sf ../init.d/beep        /etc/rc.d/rc3.d/S99beep
        ln -sf ../init.d/beep        /etc/rc.d/rc6.d/K99beep
+       ln -sf ../init.d/tmpfs       /etc/rc.d/rc0.d/K85tmpfs
+       ln -sf ../init.d/tmpfs       /etc/rc.d/rc3.d/S01tmpfs
+       ln -sf ../init.d/tmpfs       /etc/rc.d/rc6.d/K85tmpfs
 
        ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
        ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules

diff --git a/lfs/vnstat b/lfs/vnstat
index b2a4c6e758e7eef5a7777fb4d515a2c2a162760b..2e7b46c65f310b87ec31b12cb514ef6604042b87 100644 (file)
--- a/lfs/vnstat
+++ b/lfs/vnstat
@@ -76,7 +76,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)                                                                             LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
        cd $(DIR_APP) && make install
        sed -i 's|eth0|green0|g' /etc/vnstat.conf
-       sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf
-       -mkdir -p /var/log/vnstat
+       sed -i 's|/var/lib/vnstat|/var/log/rrd/vnstat|g' /etc/vnstat.conf
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index 98573749eb6ee9e61a914cbc41737cd4536bd96c..a64114fb3821887979531dfaad8418051122b63b 100644 (file)
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -24,12 +24,6 @@ case "$1" in
                        fi
                fi
 
-               /etc/init.d/collectd restore
-
-               if [ ! -e $RRDLOG.bak/ ]; then
-                       mkdir $RRDLOG.bak/
-               fi
-
                boot_mesg -n "Loading Sensor Modules..."
                for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
                modprobe $modul > /dev/null 2>&1;
@@ -47,7 +41,10 @@ case "$1" in
                evaluate_retval
                ;;
        stop)
-               /etc/init.d/collectd backup
+               # Save the ramdisk at manual stop but not at shutdown
+               if [ "$(basename $0)" == "collectd" ]; then
+                   /etc/init.d/collectd backup
+               fi
                boot_mesg "Stopping Collection daemon..."
                killproc /usr/sbin/collectd
                evaluate_retval

diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
new file mode 100644 (file)
index 0000000..4a1ae15
--- /dev/null
+++ b/src/initscripts/init.d/tmpfs
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Begin $rc_base/init.d/tmpfs
+
+
+. /etc/sysconfig/rc
+. $rc_functions
+
+eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
+
+if [ "$RRDLOG" = '' ]; then
+       RRDLOG=/var/log/rrd
+fi
+
+case "$1" in
+       start)
+               /etc/init.d/collectd restore
+               if [ ! -e $RRDLOG.bak/vnstat ]; then
+                       mkdir -p $RRDLOG.bak/vnstat
+               fi
+               ;;
+       stop)
+               /etc/init.d/collectd backup
+               ;;
+
+       *)
+               echo "Usage: $0 {start|stop}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/tmpfs