[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bad1dc36abed9d2a623e34d4e3add7080f53eb40

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bad1dc36abed9d2a623e34d4e3add7080f53eb40

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2580 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  bad1dc36abed9d2a623e34d4e3add7080f53eb40 (commit)
      from  8d0df657b53e9f9930827278bf22a3892e47e456 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bad1dc36abed9d2a623e34d4e3add7080f53eb40
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 26 17:33:33 2025 +0100

    core192: fix typo and add verbose output to rm for collectd data
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/backup/backup.pl             | 2 +-
 config/rootfiles/core/192/update.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Difference in files:
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


hooks/post-receive
--
IPFire 2.x development tree