6 files changed, 6 insertions, 5 deletions
diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index 60e0475..c7189b5 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -78,7 +78,6 @@ require_once("pfsense-utils.inc");
 require_once("captiveportal.inc");
 require_once("filter.inc");
 require_once("system.inc");
-require_once("openvpn.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("vslb.inc");
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 22f1191..8191d89 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1451,8 +1451,6 @@ function upgrade_051_to_052() {
 	if (!is_array($config['installedpackages']['carp']))
 		$config['installedpackages']['carp'] = array();
 
-	/* reconfigure openvpn services */
-	openvpn_resync_all();
 }
 
 
diff --git a/etc/rc.bootup b/etc/rc.bootup
index c28c27c..362c735 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -100,6 +100,7 @@ if($g['platform'] == "cdrom") {
 require_once("/etc/inc/config.inc");
 echo ".";
 require_once("/etc/inc/functions.inc");
+require_once("openvpn.inc");
 /* get system memory amount */
 $memory = get_memory();
 $avail = $memory[0];
@@ -349,4 +350,4 @@ mwexec_bg("/usr/sbin/update_dns_cache.sh");
 unlink("{$g['varrun_path']}/booting");
 unset($g['booting']);
 
-?>
-\ No newline at end of file
+?>
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index 0aef437..5f1df40 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -36,6 +36,7 @@
 
 
 require("guiconfig.inc");
+require_once("openvpn.inc");
 
 $pgtitle = array("OpenVPN", "Client");
 
diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php
index e2596ab..2a0670a 100644
--- a/usr/local/www/vpn_openvpn_csc.php
+++ b/usr/local/www/vpn_openvpn_csc.php
@@ -36,6 +36,7 @@
 
 
 require("guiconfig.inc");
+require_once("openvpn.inc");
 
 $pgtitle = array("OpenVPN", "Client Specific Override");
 
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index 05e6868..c939e50 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -36,6 +36,7 @@
 
 
 require("guiconfig.inc");
+require_once("openvpn.inc");
 
 $pgtitle = array("OpenVPN", "Server");
 
@@ -1213,4 +1214,4 @@ function set_checked($var,& $chk) {
         $chk = '';
 }
 
-?>
-\ No newline at end of file
+?>