From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/3] backup: Create tarball in one pass
Date: Thu, 02 Dec 2021 14:42:14 +0100
Message-ID: <ac802088-392d-fab5-4977-b1fb9a403e94@ipfire.org>
In-Reply-To: <20211202123715.2525482-2-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6102311532974826140=="
List-Id: <development.lists.ipfire.org>

--===============6102311532974826140==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi Michael,

I split the tar into two stages in May of this year as a fix for Bug #12626.

If the tar/gzip is done in one go then any files in the include.user=20
file that match a pattern in the global exclude will always be ignored=20
as the --exclude-from has precedence over any file lists at the end of=20
the command.

If this patch is implemented then I would edit the wiki to specify that=20
user files, wanting to be backed up by adding to the include.user file,=20
should not be in any of the directories listed in the global exclude=20
file and must not have a .tmp extension.


Regards,

Adolf.


On 02/12/2021 13:37, Michael Tremer wrote:
> This patch is changing the behaviour of the backup script so that it
> creates one tarball and compresses it in one go.
>
> This will save storing the original tarball on disk before compressing
> it which on my test system requires significant disk space.
>
> This patch also solves a bug where the backup file included with the ISO
> image could not be extracted because it was not gzip-compressed when it
> was expected to be.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   config/backup/backup.pl | 15 ++++-----------
>   1 file changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
> index 0b47af2d6..bed5952de 100644
> --- a/config/backup/backup.pl
> +++ b/config/backup/backup.pl
> @@ -58,20 +58,13 @@ make_backup() {
>   	done
>  =20
>   	# Backup using global exclude/include definitions
> -	tar cvf "${filename}" \
> +	tar cvfz "${filename}" \
>   		--exclude-from=3D"/var/ipfire/backup/exclude" \
> -		$(process_includes "/var/ipfire/backup/include") \
> -		"$@"
> -
> -	# Backup using user exclude/include definitions and append to global back=
up
> -	tar rvf "${filename}" \
>   		--exclude-from=3D"/var/ipfire/backup/exclude.user" \
> +		$(process_includes "/var/ipfire/backup/include") \
>   		$(process_includes "/var/ipfire/backup/include.user") \
>   		"$@"
>  =20
> -	# gzip the combined global/user backup and use .ipf suffix
> -	gzip --suffix .ipf "${filename}"
> -
>   	return 0
>   }
>  =20
> @@ -215,7 +208,7 @@ main() {
>   			local filename=3D"${1}"
>  =20
>   			if [ -z "${filename}" ]; then
> -				filename=3D"/var/ipfire/backup/${NOW}"
> +				filename=3D"/var/ipfire/backup/${NOW}.ipf"
>   			fi
>  =20
>   			make_backup "${filename}" $(find_logfiles)
> @@ -225,7 +218,7 @@ main() {
>   			local filename=3D"${1}"
>  =20
>   			if [ -z "${filename}" ]; then
> -				filename=3D"/var/ipfire/backup/${NOW}"
> +				filename=3D"/var/ipfire/backup/${NOW}.ipf"
>   			fi
>  =20
>   			make_backup "${filename}"

--=20
Sent from my laptop


--===============6102311532974826140==--