From 5604dc748d0c38a05d2f909aedbe50d8d05684e7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 6 Mar 2015 17:22:18 +0100 Subject: [PATCH] backup: make include file parsing more robust. --- config/backup/backup.pl | 8 +++----- config/rootfiles/core/88/filelists/files | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index f4823fcfbd..d430f34674 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -160,12 +160,10 @@ sub createinclude(){ close(DATEI); foreach (@Zeilen){ - if ( $_ =~ /\*/){ - my @files = `ls $_`; + chomp($_); + my @files = `find $_ -maxdepth 0 2>/dev/null`; foreach (@files){ push(@include,$_); - } - } - else {push(@include,$_);} + } } } diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files index 5ee23b97fa..0251b5d6b7 100644 --- a/config/rootfiles/core/88/filelists/files +++ b/config/rootfiles/core/88/filelists/files @@ -2,4 +2,5 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi +var/ipfire/backup/bin/backup.pl var/ipfire/langs -- 2.39.2