Re: [PATCH] backup.pl: fix Bug12817 - directories missing in backup after include file changed to relat>

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2038 bytes --]

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 relative paths in CU164
>   commit https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=c7e0d73e7cfd7be95db9d0a5f3392b8241813d5b
>   resulted in 20 core function directories no longer being backed up. Additionally a
>   similar effect occurred with some addon backups

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

In that case, the file list should be changed that tar knows what files to pack and what not. I wouldn’t 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 system and
>   confirmed to fix the problem. Backup of all directories again 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() {
> 	local include
> 
> -	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
> }
> 
> make_backup() {
> -- 
> 2.35.1
>