From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 Jan 2014 11:29:44 +0000 (+0100)
Subject: backup: Convert backups with old CCD files.
X-Git-Tag: v2.15-beta1~19^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59cbe38697db109f4860e1117b8307b588957b6c;p=ipfire-2.x.git

backup: Convert backups with old CCD files.
---

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index f9b8302af9..fd626725ea 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -64,6 +64,9 @@ elsif ($ARGV[0] eq 'restore') {
   system("cd / && tar -xvz -p -f /tmp/restore.ipf");
   #Here some converter scripts to correct old Backups (before core 65)
   system("/usr/sbin/ovpn-ccd-convert");
+
+  # 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]");}
diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files
index 34458cac06..9d4fbe49a9 100644
--- a/config/rootfiles/core/75/filelists/files
+++ b/config/rootfiles/core/75/filelists/files
@@ -4,5 +4,6 @@ opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 usr/lib/openvpn/verify
 usr/local/bin/convert-ovpn
+var/ipfire/backup/bin/backup.pl
 var/ipfire/header.pl
 var/ipfire/langs