From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] backup.pl: fix Bug12817 - directories missing in backup after include file changed to relat> Date: Fri, 25 Mar 2022 13:22:47 +0100 Message-ID: <20220325122247.7036-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4904308816074866577==" List-Id: --===============4904308816074866577== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Bernhard Bitsch - 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=3Dc7e0d73e7= cfd7be95db9d0a5f3392b8241813d5b resulted in 20 core function directories no longer being backed up. Additi= onally a similar effect occurred with some addon backups - Fix applied here proposed by Bernhard Bitsch and tested on a vm testbed sys= tem and confirmed to fix the problem. Backup of all directories again being done. Fixes: Bug12817 Tested-By: Adolf Belka Signed-off-by: Adolf Belka --- 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 =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 --===============4904308816074866577==--