From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 26 Jan 2025 16:33:33 +0000 (+0100)
Subject: core192: fix typo and add verbose output to rm for collectd data
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bad1dc36abed9d2a623e34d4e3add7080f53eb40;p=people%2Fstevee%2Fipfire-2.x.git

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 07b809441..7d2c3f42d 100644
--- 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 0ca3bad1a..fce5976c3 100644
--- 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