collectd: another fix at converting rrd databases

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index c64d56aee7d532e642972295433a1955b04e0bfe..3c33608c54e0d6e46fffc64921624cfef267e7e7 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -272,11 +272,11 @@ restore_backup() {
                        mv -f /var/log/rrd/collectd/localhost/cpufreq/cpufreq-$i.rrd \
                                /var/log/rrd/collectd/localhost/cpufreq-$i/cpufreq.rrd
                fi
-       done
-       if [ -e /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperature.rrd ]; then
-               mv -f /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperature.rrd \
-               /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature.rrd
+               if [ -e /var/log/rrd/collectd/localhost/thermal-thermal_zone$i/temperature-temperature.rrd ]; then
+                       mv -f /var/log/rrd/collectd/localhost/thermal-thermal_zone$i/temperature-temperature.rrd \
+                       /var/log/rrd/collectd/localhost/thermal-thermal_zone$i/temperature.rrd
        fi
+       done
 
        # Create collectd 4.x to 5.x migration script from rrd contents, run the script that
        # was created and then remove the old interface directory if it is present as it will

diff --git a/config/rootfiles/core/192/update.sh b/config/rootfiles/core/192/update.sh
index 858c27d2fb0b8178081e38732656efe2c7664c35..072a45dda3450109a0b455ab6a8ad74593c9ac79 100644 (file)
--- a/config/rootfiles/core/192/update.sh
+++ b/config/rootfiles/core/192/update.sh
@@ -116,11 +116,11 @@ do
                mv -f /var/log/rrd/collectd/localhost/cpufreq/cpufreq-$i.rrd \
                        /var/log/rrd/collectd/localhost/cpufreq-$i/cpufreq.rrd
        fi
-done
-if [ -e /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperature.rrd ]; then
-       mv -f /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperature.rrd \
-               /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature.rrd
+       if [ -e /var/log/rrd/collectd/localhost/thermal-thermal_zone$i/temperature-temperature.rrd ]; then
+               mv -f /var/log/rrd/collectd/localhost/thermal-thermal_zone$i/temperature-temperature.rrd \
+                       /var/log/rrd/collectd/localhost/thermal-thermal_zone$i/temperature.rrd
 fi
+done
 /var/ipfire/collectd-migrate-4-to-5.pl --indir /var/log/rrd/ > /tmp/rrd-migrate.sh
 sh /tmp/rrd-migrate.sh >/dev/null 2>&1
 rm -rvf \