public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Cc: Adolf Belka <adolf.belka@ipfire.org>
Subject: [PATCH] backup.pl: Fix issue with University of Toulouse change
Date: Fri,  5 Jun 2026 18:40:19 +0200	[thread overview]
Message-ID: <20260605164020.3661242-1-adolf.belka@ipfire.org> (raw)

- Some months ago University of Toulouse changed any lists with a different French and
   English name from being duplicate files to being a file plus a symlink.
- Doing a restore from a backup with symlinks into a system with only file names
   resulted in a symlink trying to be created when a file with the same name already
   existed causing a failure.
- This failure stopped the restore part way through resulting in only a partial restore.
- This patch removes all entries in the urlfilter blacklists, allowing all restored
   entries to be created.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/backup/backup.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 7454ae762..417d33f40 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2026  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -83,6 +83,10 @@ restore_backup() {
 	# certificates being left in directory after a restore
 	rm -f /var/ipfire/ovpn/certs/*
 
+	# remove all previous blacklist entries from urlfilter
+	# to prevent any clashes between symlinks and files
+	rm -Rf /var/ipfire/urrlfilter/blacklists/*
+
 	# Extract backup
 	if ! tar xvzpf "${filename}" -C / \
 			--exclude-from="/var/ipfire/backup/exclude" \
-- 
2.54.0



             reply	other threads:[~2026-06-05 16:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-05 16:40 Adolf Belka [this message]
2026-06-05 16:40 ` [PATCH] backup.pl: unbound entries not needed with knot in place Adolf Belka
     [not found] ` <a8f638c6-ed7c-4972-b5a5-dff3089182fe@ipfire.org>
2026-06-05 17:37   ` [PATCH] backup.pl: Fix issue with University of Toulouse change Adolf Belka

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=20260605164020.3661242-1-adolf.belka@ipfire.org \
    --to=adolf.belka@ipfire.org \
    --cc=development@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