From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer 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 17:40:59 +0100 Message-ID: In-Reply-To: <8999a7e1-833f-a056-f308-0757e3b2afbb@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7332578515793468425==" List-Id: --===============7332578515793468425== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Adolf, So looking at this problem, it seems to be pretty bad. Any backup created wit= h c164 is practically incomplete. Ouch. So since c165 is already built and uploaded to the servers, I am not going to= re-open it now. I suppose fixing the bug ASAP is what we need to do for now before we are loo= king deeper into some long-term solution. Could you confirm to me that this change is fixing the problem? diff --git a/config/backup/backup.pl b/config/backup/backup.pl index a2337cf23..a25c9a355 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -38,7 +38,7 @@ process_includes() { for include in $@; do local file while read -r file; do - for file in ${file}; do + for file in /${file}; do if [ -e "/${file}" ]; then echo "${file}" fi It basically does the same as the pushd/popd set, but I find it a little bit = more elegant :) -Michael > On 28 Mar 2022, at 17:24, Adolf Belka wrote: >=20 > Hi Michael, >=20 > On 28/03/2022 16:30, Adolf Belka wrote: >> Hi Michael, >>=20 >> On 28/03/2022 16:08, Michael Tremer wrote: >>> Hello Adolf, >>>=20 >>>> On 25 Mar 2022, at 12:22, Adolf Belka wrote: >>>>=20 >>>> From: Bernhard Bitsch >>>>=20 >>>> - The change of the backup include file from absolute paths to relative = paths in CU164 >>>> commit https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommit;h=3Dc7e0d73= e7cfd7be95db9d0a5f3392b8241813d5b >>>> resulted in 20 core function directories no longer being backed up. Addi= tionally a >>>> similar effect occurred with some addon backups >>>=20 >>> Why is this happening? Is it because tar relied on the shell to expand th= e glowing characters? >> I don't know. I found the issue, together with someone on the forum. Bernh= ard suggested the fix, which I tested, but I don't understand the issues behi= nd the problem. Maybe Bernhard has more input on what might be causing the pr= oblem. >>>=20 >>> In that case, the file list should be changed that tar knows what files t= o pack and what not. I wouldn=E2=80=99t want to rely on globbing unless we ha= ve a reason that forces us. >> Okay, will try and see if I can understand the basis for why the problem i= s occurring with the change of names from absolute to relative. >>=20 > I have tried to look at the code and see what the problem is. I can underst= and the essence of what the code is doing but not why it is going wrong, or a= t least yet. > What a comparison of the files that are saved with the ones that are not sa= ved shows that the ones not saved are those that would get selected by wildca= rds in the include file. All the ones saved look to be those with explicit fi= lenames with no wild cards. >=20 > So something in either the process-includes subroutine or in the tar comman= d is not working with wildcards. >=20 > I will try and see if I can set a small code loop up to see where the probl= em occurs. >=20 > Regards, > Adolf. >> Regards, >> Adolf. >>>=20 >>>> - Fix applied here proposed by Bernhard Bitsch and tested on a vm testbe= d system and >>>> confirmed to fix the problem. Backup of all directories again being done. >>>>=20 >>>> Fixes: Bug12817 >>>> Tested-By: Adolf Belka >>>> Signed-off-by: Adolf Belka >>>> --- >>>> config/backup/backup.pl | 22 ++++++++++++---------- >>>> 1 file changed, 12 insertions(+), 10 deletions(-) >>>>=20 >>>> 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() { >>>> local include >>>>=20 >>>> - for include in $@; do >>>> - local file >>>> - while read -r file; do >>>> - for file in ${file}; do >>>> - if [ -e "/${file}" ]; then >>>> - echo "${file}" >>>> - fi >>>> - done >>>> - done < "${include}" >>>> - done | sort -u >>>> + pushd / >/dev/null >>>> + for include in $@; do >>>> + local file >>>> + while read -r file; do >>>> + for file in ${file}; do >>>> + if [ -e "/${file}" ]; then >>>> + echo "${file}" >>>> + fi >>>> + done >>>> + done < "${include}" >>>> + done | sort -u >>>> + popd >/dev/null >>>> } >>>>=20 >>>> make_backup() { >>>> --=20 >>>> 2.35.1 >>>>=20 >>>=20 >>=20 >=20 > --=20 > Sent from my laptop --===============7332578515793468425==--