From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7909dc2194718f7f929261cd33fba06f145fd856
Date: Thu, 30 Jan 2025 11:53:35 +0000 [thread overview]
Message-ID: <4YkHV76bs1z2xMh@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3332 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 7909dc2194718f7f929261cd33fba06f145fd856 (commit)
from 23772010b193df17abfd5d250a8a7da165256475 (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 7909dc2194718f7f929261cd33fba06f145fd856
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jan 30 12:52:51 2025 +0100
collectd: another fix at converting rrd databases
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/backup.pl | 8 ++++----
config/rootfiles/core/192/update.sh | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index c64d56aee..3c33608c5 100644
--- 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 858c27d2f..072a45dda 100644
--- 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 \
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2025-01-30 11:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4YkHV76bs1z2xMh@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox