From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 2/3] backup: Create tarball in one pass Date: Thu, 02 Dec 2021 15:48:55 +0000 Message-ID: <3BCAA893-D04F-4688-880B-C925843EC2B6@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0221350260481273021==" List-Id: --===============0221350260481273021== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Adolf, Thank you for reviewing my patch :) > On 2 Dec 2021, at 13:42, Adolf Belka wrote: >=20 > Hi Michael, >=20 > I split the tar into two stages in May of this year as a fix for Bug #12626. >=20 > If the tar/gzip is done in one go then any files in the include.user file t= hat match a pattern in the global exclude will always be ignored as the --exc= lude-from has precedence over any file lists at the end of the command. I should have reached out because it wasn=E2=80=99t quite clear to me why thi= s was split into two operations. I would have considered this the expected behaviour, because what is excluded= is excluded. Clearly you expected something else to happen which I would als= o consider a valid expectation. > If this patch is implemented then I would edit the wiki to specify that use= r files, wanting to be backed up by adding to the include.user file, should n= ot be in any of the directories listed in the global exclude file and must no= t have a .tmp extension. Is there any use-case where this would become a big problem? Is there anythin= g the user would include that has previously been globally excluded? -Michael >=20 >=20 > Regards, >=20 > Adolf. >=20 >=20 > 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. >>=20 >> This will save storing the original tarball on disk before compressing >> it which on my test system requires significant disk space. >>=20 >> 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. >>=20 >> Signed-off-by: Michael Tremer >> --- >> config/backup/backup.pl | 15 ++++----------- >> 1 file changed, 4 insertions(+), 11 deletions(-) >>=20 >> 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 >> # 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 bac= kup >> - tar rvf "${filename}" \ >> --exclude-from=3D"/var/ipfire/backup/exclude.user" \ >> + $(process_includes "/var/ipfire/backup/include") \ >> $(process_includes "/var/ipfire/backup/include.user") \ >> "$@" >> - # gzip the combined global/user backup and use .ipf suffix >> - gzip --suffix .ipf "${filename}" >> - >> return 0 >> } >> @@ -215,7 +208,7 @@ main() { >> local filename=3D"${1}" >> if [ -z "${filename}" ]; then >> - filename=3D"/var/ipfire/backup/${NOW}" >> + filename=3D"/var/ipfire/backup/${NOW}.ipf" >> fi >> make_backup "${filename}" $(find_logfiles) >> @@ -225,7 +218,7 @@ main() { >> local filename=3D"${1}" >> if [ -z "${filename}" ]; then >> - filename=3D"/var/ipfire/backup/${NOW}" >> + filename=3D"/var/ipfire/backup/${NOW}.ipf" >> fi >> make_backup "${filename}" >=20 > --=20 > Sent from my laptop --===============0221350260481273021==--