From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] backup: Fix broken globbing expansion
Date: Tue, 29 Mar 2022 15:36:50 +0200
Message-ID: <a71ab96e-a750-32a7-fcac-5f3d4cd09c37@ipfire.org>
In-Reply-To: <11ECA6D8-AB58-4546-9F7C-50E19197C4E2@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5616401484262628069=="
List-Id: <development.lists.ipfire.org>

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

Hi,

Am 29.03.2022 um 15:11 schrieb Michael Tremer:
> Hello,
>=20
> Could you please send the file listing to find out what is being included w=
hat shouldn=E2=80=99t?
>=20

Just for easy quick handling, you can use
'/var/ipfire/backup/bin/backup.pl list' to show the files included.

Bernhard
> -Michael
>=20
>> On 29 Mar 2022, at 14:10, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> Hi Michael,
>>
>> Just tried this patch out on my vm testbed system and it still doesn't wor=
k for me. The backup file had got to 1.3GB when I deleted the backup file as =
it was still growing. The normal correct backup file on that vm machine is ar=
ound 7MB
>>
>> The above was the case for both running it from the WUI or from the comman=
d line from my unprivileged user using sudo backupctrl exclude
>>
>> Regards,
>>
>> Adolf.
>>
>>
>> On 29/03/2022 14:27, Michael Tremer wrote:
>>> This patch fixes globbing expansion in the backup include file list
>>> which got broken in c7e0d73e7cfd7be95db9d0a5f3392b8241813d5b.
>>>
>>> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
>>> ---
>>>   config/backup/backup.pl | 8 ++++----
>>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
>>> index a2337cf23..6f9295e94 100644
>>> --- a/config/backup/backup.pl
>>> +++ b/config/backup/backup.pl
>>> @@ -19,6 +19,8 @@
>>>   #                                                                      =
       #
>>>   #######################################################################=
########
>>>   +shopt -s nullglob
>>> +
>>>   NOW=3D"$(date "+%Y-%m-%d-%H:%M")"
>>>     list_addons() {
>>> @@ -38,10 +40,8 @@ process_includes() {
>>>   	for include in $@; do
>>>   		local file
>>>   		while read -r file; do
>>> -			for file in ${file}; do
>>> -				if [ -e "/${file}" ]; then
>>> -					echo "${file}"
>>> -				fi
>>> +			for file in /${file}; do
>>> +				echo "${file}"
>>>   			done
>>>   		done < "${include}"
>>>   	done | sort -u
>=20

--===============5616401484262628069==--