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] backup.pl: fix Bug12817 - directories missing in backup
 after include file changed to relat>
Date: Mon, 28 Mar 2022 18:24:39 +0200
Message-ID: <8999a7e1-833f-a056-f308-0757e3b2afbb@ipfire.org>
In-Reply-To: <2d8f8c3d-5ebb-146a-9bd3-adae43812715@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4949244427615970585=="
List-Id: <development.lists.ipfire.org>

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

Hi Michael,

On 28/03/2022 16:30, Adolf Belka wrote:
> Hi Michael,
>
> On 28/03/2022 16:08, Michael Tremer wrote:
>> Hello Adolf,
>>
>>> On 25 Mar 2022, at 12:22, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>
>>> From: Bernhard Bitsch <bbitsch(a)ipfire.org>
>>>
>>> - The change of the backup include file from absolute paths to=20
>>> relative paths in CU164
>>> =C2=A0=C2=A0 commit=20
>>> https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommit;h=3Dc7e0d73e7cfd7be=
95db9d0a5f3392b8241813d5b
>>> =C2=A0=C2=A0 resulted in 20 core function directories no longer being bac=
ked=20
>>> up. Additionally a
>>> =C2=A0=C2=A0 similar effect occurred with some addon backups
>>
>> Why is this happening? Is it because tar relied on the shell to=20
>> expand the glowing characters?
> I don't know. I found the issue, together with someone on the forum.=20
> Bernhard suggested the fix, which I tested, but I don't understand the=20
> issues behind the problem. Maybe Bernhard has more input on what might=20
> be causing the problem.
>>
>> In that case, the file list should be changed that tar knows what=20
>> files to pack and what not. I wouldn=E2=80=99t want to rely on globbing=20
>> unless we have a reason that forces us.
> Okay, will try and see if I can understand the basis for why the=20
> problem is occurring with the change of names from absolute to relative.
>
I have tried to look at the code and see what the problem is. I can=20
understand the essence of what the code is doing but not why it is going=20
wrong, or at least yet.
What a comparison of the files that are saved with the ones that are not=20
saved shows that the ones not saved are those that would get selected by=20
wildcards in the include file. All the ones saved look to be those with=20
explicit filenames with no wild cards.

So something in either the process-includes subroutine or in the tar=20
command is not working with wildcards.

I will try and see if I can set a small code loop up to see where the=20
problem occurs.

Regards,
Adolf.
> Regards,
> Adolf.
>>
>>> - Fix applied here proposed by Bernhard Bitsch and tested on a vm=20
>>> testbed system and
>>> =C2=A0=C2=A0 confirmed to fix the problem. Backup of all directories agai=
n=20
>>> being done.
>>>
>>> Fixes: Bug12817
>>> Tested-By: Adolf Belka <adolf.belka(a)ipfire.org>
>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> ---
>>> config/backup/backup.pl | 22 ++++++++++++----------
>>> 1 file changed, 12 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
>>> index a2337cf23..c7dbc6cae 100644
>>> --- a/config/backup/backup.pl
>>> +++ b/config/backup/backup.pl
>>> @@ -35,16 +35,18 @@ list_addons() {
>>> process_includes() {
>>> =C2=A0=C2=A0=C2=A0=C2=A0local include
>>>
>>> -=C2=A0=C2=A0=C2=A0 for include in $@; do
>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 local file
>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 while read -r file; do
>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for f=
ile in ${file}; do
>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 if [ -e "/${file}" ]; then
>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo "${file}"
>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 fi
>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 done
>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 done < "${include}"
>>> -=C2=A0=C2=A0=C2=A0 done | sort -u
>>> +=C2=A0=C2=A0=C2=A0 pushd / >/dev/null
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for include in $@; do
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 local=
 file
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 while=
 read -r file; do
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 for file in ${file}; do
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ -e "/${file}" ]; then
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo "${fi=
le}"
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 done
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 done =
< "${include}"
>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 done | sort -u
>>> +=C2=A0=C2=A0=C2=A0 popd >/dev/null
>>> }
>>>
>>> make_backup() {
>>> --=20
>>> 2.35.1
>>>
>>
>

--=20
Sent from my laptop


--===============4949244427615970585==--