ramdisk: Avoid copying data if no ramdisk is used

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / collectd

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index 24187d21583649ef684eba6bc4289d6482cffa13..e5c35950d2dfdb4bf78d100472d6a3882e468e9b 100644 (file)
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -13,20 +13,9 @@ fi
 case "$1" in
        start)
                if use_ramdisk; then
-                       #mount ramdisk
-                       if ! mountpoint $RRDLOG &>/dev/null; then
-                               boot_mesg "Mount rrd Ramdisk..."
-                               if [ $(find "$RRDLOG" | wc -l) -ne 1 ]; then
-                                       backup_ramdisk "$RRDLOG"
-                               fi
-                               mount_ramdisk "$RRDLOG"
-                               evaluate_retval
-
-                               #restore old values to ramdisk if exist
-                               restore_ramdisk "$RRDLOG"
-                       fi
-               else
-                       restore_ramdisk "$RRDLOG"
+                       boot_mesg "Mounting RRD ramdisk..."
+                       mount_ramdisk "${RRDLOG}"
+                       evaluate_retval
                fi
 
                # If run from init and collectd alrady started then exit silent
@@ -122,10 +111,9 @@ case "$1" in
                boot_mesg "Stopping Collection daemon..."
                killproc /usr/sbin/collectd
                evaluate_retval
-               backup_ramdisk "$RRDLOG"
-               umount_ramdisk "$RRDLOG"
-               # sync after backup...
-               sync
+
+               # Umount the ramdisk (if any)
+               umount_ramdisk "${RRDLOG}"
                ;;
        restart)
                ${0} stop