From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@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 15:08:04 +0100
Message-ID: <B764D5D7-1520-4671-A9B2-BF1220012E5E@ipfire.org>
In-Reply-To: <20220325122247.7036-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3518874365758553903=="
List-Id: <development.lists.ipfire.org>

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

Hello Adolf,

> On 25 Mar 2022, at 12:22, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> From: Bernhard Bitsch <bbitsch(a)ipfire.org>
>=20
> - The change of the backup include file from absolute paths to relative pat=
hs in CU164
>   commit https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommit;h=3Dc7e0d73e=
7cfd7be95db9d0a5f3392b8241813d5b
>   resulted in 20 core function directories no longer being backed up. Addit=
ionally a
>   similar effect occurred with some addon backups

Why is this happening? Is it because tar relied on the shell to expand the gl=
owing characters?

In that case, the file list should be changed that tar knows what files to pa=
ck and what not. I wouldn=E2=80=99t want to rely on globbing unless we have a=
 reason that forces us.

> - Fix applied here proposed by Bernhard Bitsch and tested on a vm testbed s=
ystem and
>   confirmed to fix the problem. Backup of all directories again being done.
>=20
> 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(-)
>=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


--===============3518874365758553903==--