Merge branch 'nfs-server-fix' into next

[people/pmueller/ipfire-2.x.git] / config / backup / backup.pl

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 5424a1e123a8d443b3fcb135a30f25162ae44859..d430f34674a83d80505c01e94d85f34f44ef05d7 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -120,11 +120,14 @@ elsif ($ARGV[0] eq 'restore') {
   #PORTFORWARD CONVERTER
   if( -d "${General::swroot}/portfw"){
        #START CONVERTER "PORTFW"
-       System("/usr/sbin/convert-portfw");
+       system("/usr/sbin/convert-portfw");
        rmtree("${General::swroot}/portfw");
   }
   system("/usr/local/bin/firewallctrl");
- }
+
+  # Convert old OpenVPN CCD files (CN change, core 75).
+  system("/usr/local/bin/convert-ovpn");
+}
 elsif ($ARGV[0] eq 'restoreaddon') {
   if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
   system("cd / && tar -xvz -p -f /var/ipfire/backup/addons/backup/$ARGV[1]");
@@ -157,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,$_);}
+    }
   }
 }