core192: fix typo and add verbose output to rm for collectd data

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

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 07b8094418eb2783aa0fd777f6760dada07e987e..7d2c3f42d622f858fedc91b5a1cfff577226a982 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -271,7 +271,7 @@ restore_backup() {
        rm -rf \
                /var/log/rrd/collectd/localhost/cpufreq
                /var/log/rrd/collectd/localhost/interface
-               /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperatur-temperatur.rrd
+               /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperature.rrd
 
        # start collectd after restore
        /etc/rc.d/init.d/collectd start

diff --git a/config/rootfiles/core/192/update.sh b/config/rootfiles/core/192/update.sh
index 0ca3bad1aef96ee6a3bac6c16acc15d0f791f333..fce5976c36b5f9feb99d99bf4d0d0e0a8b4cb33e 100644 (file)
--- a/config/rootfiles/core/192/update.sh
+++ b/config/rootfiles/core/192/update.sh
@@ -111,10 +111,10 @@ ldconfig
 # be empty after the migration has been carried out.
 /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 -rf \
-               /var/log/rrd/collectd/localhost/cpufreq
-               /var/log/rrd/collectd/localhost/interface
-               /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperatur-temperatur.rrd
+rm -rvf \
+       /var/log/rrd/collectd/localhost/cpufreq
+       /var/log/rrd/collectd/localhost/interface
+       /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperature.rrd
 
 # Start services
 /etc/init.d/collectd start