backup: make include file parsing more robust.

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index f4823fcfbde655009d95b59401a19643f99e83e5..d430f34674a83d80505c01e94d85f34f44ef05d7 100644 (file)
--- 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 5ee23b97fabcc00ca066fd1bd43d58487147cbb8..0251b5d6b791232a9e976e5d75f058600e67487e 100644 (file)
--- 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