From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 6 Mar 2015 16:22:18 +0000 (+0100)
Subject: backup: make include file parsing more robust.
X-Git-Tag: v2.17-core89~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5604dc748d0c38a05d2f909aedbe50d8d05684e7;p=ipfire-2.x.git

backup: make include file parsing more robust.
---

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