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 23772010b193df17abfd5d250a8a7da165256475 (commit) via ebceac121adffbf8b8690101e4a50e3f4c1566e5 (commit) via 7ba01388d488ea2cefe704b31d14acf43648bfb8 (commit) from 2b892c6863960fd35034fb2bee6c1fd69372b587 (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 23772010b193df17abfd5d250a8a7da165256475 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 30 10:25:43 2025 +0100
kernel: update riscv64 rootfile
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ebceac121adffbf8b8690101e4a50e3f4c1566e5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 30 10:23:10 2025 +0100
collectd: add more changes to the converter
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7ba01388d488ea2cefe704b31d14acf43648bfb8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 30 10:18:01 2025 +0100
collectd: add some devices to the ignore list
disks: cdroms, tape, loop and ram cooling-devices: 0-7 was already disabled but there are more possible
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/backup.pl | 32 ++++++++++++++++++++++++++++---- config/collectd/collectd.conf | 4 ++++ config/collectd/collectd.thermal | 10 ++-------- config/rootfiles/common/riscv64/linux | 6 +----- config/rootfiles/core/192/update.sh | 18 +++++++++++++++++- 5 files changed, 52 insertions(+), 18 deletions(-)
Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 51797c780..c64d56aee 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -263,15 +263,39 @@ restore_backup() { rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf fi
+ # The collectd directory structure was changed but not all changes + # are done by the official migration script generator + for i in $(seq 0 63); + do + if [ -e /var/log/rrd/collectd/localhost/cpufreq/cpufreq-$i.rrd ]; then + mkdir -p /var/log/rrd/collectd/localhost/cpufreq-$i + 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 + fi + # 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 # 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*/temperature-temperature.rrd + + # Run old collectd cleanup only if the interface dir exist to prevent cleanup of + # new devices if the user have reenabled it and restore a backup + if [ -d /var/log/rrd/collectd/localhost/interface ]; then + rm -rf \ + /var/log/rrd/collectd/localhost/cpufreq \ + /var/log/rrd/collectd/localhost/disk-loop* \ + /var/log/rrd/collectd/localhost/disk-sg* \ + /var/log/rrd/collectd/localhost/disk-sr* \ + /var/log/rrd/collectd/localhost/disk-ram* \ + /var/log/rrd/collectd/localhost/interface \ + /var/log/rrd/collectd/localhost/thermal-cooling_device* + fi
# start collectd after restore /etc/rc.d/init.d/collectd start diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index be6f1fd12..020604e74 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -40,6 +40,10 @@ include "/etc/collectd.precache"
<Plugin "disk"> Disk "/[hs]d[a-z][0-9]$/" + Disk "/loop[0-9]$/" + Disk "/sg[0-9]$/" + Disk "/sr[0-9]$/" + Disk "/ram[0-9]$/" IgnoreSelected true </Plugin>
diff --git a/config/collectd/collectd.thermal b/config/collectd/collectd.thermal index 97403fbb6..46d9a4a06 100644 --- a/config/collectd/collectd.thermal +++ b/config/collectd/collectd.thermal @@ -1,13 +1,7 @@ LoadPlugin thermal
<Plugin thermal> - Device "cooling_device0" - Device "cooling_device1" - Device "cooling_device2" - Device "cooling_device3" - Device "cooling_device4" - Device "cooling_device5" - Device "cooling_device6" - Device "cooling_device7" + Device "/cooling_device[0-9]/" + Device "/cooling_device[0-9][0-9]/" IgnoreSelected true </Plugin> diff --git a/config/rootfiles/common/riscv64/linux b/config/rootfiles/common/riscv64/linux index 6e885ce90..e1b6c071c 100644 --- a/config/rootfiles/common/riscv64/linux +++ b/config/rootfiles/common/riscv64/linux @@ -8118,10 +8118,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/HAVE_IRQ_TIME_ACCOUNTING #lib/modules/KVER/build/include/config/HAVE_KCSAN_COMPILER #lib/modules/KVER/build/include/config/HAVE_KERNEL_GZIP -#lib/modules/KVER/build/include/config/HAVE_KERNEL_LZ4 -#lib/modules/KVER/build/include/config/HAVE_KERNEL_LZMA -#lib/modules/KVER/build/include/config/HAVE_KERNEL_LZO -#lib/modules/KVER/build/include/config/HAVE_KERNEL_XZ #lib/modules/KVER/build/include/config/HAVE_KERNEL_ZSTD #lib/modules/KVER/build/include/config/HAVE_KPROBES #lib/modules/KVER/build/include/config/HAVE_KRETPROBES @@ -8557,7 +8553,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/KALLSYMS #lib/modules/KVER/build/include/config/KALLSYMS_ALL #lib/modules/KVER/build/include/config/KCMP -#lib/modules/KVER/build/include/config/KERNEL_XZ +#lib/modules/KVER/build/include/config/KERNEL_GZIP #lib/modules/KVER/build/include/config/KERNFS #lib/modules/KVER/build/include/config/KEXEC #lib/modules/KVER/build/include/config/KEXEC_CORE diff --git a/config/rootfiles/core/192/update.sh b/config/rootfiles/core/192/update.sh index 03bfc0bd6..858c27d2f 100644 --- a/config/rootfiles/core/192/update.sh +++ b/config/rootfiles/core/192/update.sh @@ -109,12 +109,28 @@ ldconfig # 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 # be empty after the migration has been carried out. +for i in $(seq 0 63); +do + if [ -e /var/log/rrd/collectd/localhost/cpufreq/cpufreq-$i.rrd ]; then + mkdir -p /var/log/rrd/collectd/localhost/cpufreq-$i + 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 +fi /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 \ /var/log/rrd/collectd/localhost/cpufreq \ + /var/log/rrd/collectd/localhost/disk-loop* \ + /var/log/rrd/collectd/localhost/disk-sg* \ + /var/log/rrd/collectd/localhost/disk-sr* \ + /var/log/rrd/collectd/localhost/disk-ram* \ /var/log/rrd/collectd/localhost/interface \ - /var/log/rrd/collectd/localhost/thermal-thermal_zone*/temperature-temperature.rrd + /var/log/rrd/collectd/localhost/thermal-cooling_device*
# Start services /etc/init.d/collectd start
hooks/post-receive -- IPFire 2.x development tree