]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
backup.pl: Update to migrate rrd directories for collectd-5.x
authorAdolf Belka <adolf.belka@ipfire.org>
Wed, 25 Dec 2024 13:48:25 +0000 (14:48 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 21 Jan 2025 18:32:21 +0000 (19:32 +0100)
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
config/backup/backup.pl

index b618576e1536e4db72a3c63618f3b6bd7122a9b5..959804b591634578bdad493ef12958e6a9eb6b0f 100644 (file)
@@ -258,6 +258,16 @@ restore_backup() {
        if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then
                rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf
        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
+       if [ -d /var/log/rrd/collectd/localhost/interface/ ]; then
+               rm -Rf /var/log/rrd/collectd/localhost/interface/
+       fi
+
        return 0
 }