From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. bad1dc36abed9d2a623e34d4e3add7080f53eb40 Date: Sun, 26 Jan 2025 16:34:41 +0000 Message-ID: <4YgxwK6wsSz2xhX@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7619352739095584723==" List-Id: --===============7619352739095584723== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Sun Jan 26 17:33:33 2025 +0100 core192: fix typo and add verbose output to rm for collectd data =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- 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-temperatu= r.rrd + /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperat= ure.rrd =20 # 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-migr= ate.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-temperatu= r.rrd +rm -rvf \ + /var/log/rrd/collectd/localhost/cpufreq + /var/log/rrd/collectd/localhost/interface + /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperatu= re.rrd =20 # Start services /etc/init.d/collectd start hooks/post-receive -- IPFire 2.x development tree --===============7619352739095584723==--