Merge branch 'master' into fifteen

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

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 5424a1e123a8d443b3fcb135a30f25162ae44859..3172d6dc6bb36804986fb371b52eaa20a3eb402b 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -120,11 +120,15 @@ 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]");