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.pl: fix Bug12817 - directories missing in backup
 after include file changed to relat>
Date: Fri, 25 Mar 2022 14:26:44 +0100
Message-ID: <2e01e8a7-5b8f-8361-722b-d59bdb881d2a@ipfire.org>
In-Reply-To: <20220325122247.7036-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0340121206569843432=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Acked-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 25.03.2022 um 13:22 schrieb Adolf Belka:
> 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=3Dc7e0d7=
3e7cfd7be95db9d0a5f3392b8241813d5b
>     resulted in 20 core function directories no longer being backed up. Add=
itionally a
>     similar effect occurred with some addon backups
> - 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 don=
e.
>=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() {

--===============0340121206569843432==--