summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2009-07-08 16:49:56 +0000
committerErmal Luçi <eri@pfsense.org>2009-07-08 16:49:56 +0000
commitd84bd468185d10c5fbc4b010efcd1db59e43c53b (patch)
treea4417120db26bb3a0b0340a27ca45981c8ca4b64 /etc
parent985fc0fb9779f498c5797ea302b3669553ed785f (diff)
downloadpfsense-d84bd468185d10c5fbc4b010efcd1db59e43c53b.zip
pfsense-d84bd468185d10c5fbc4b010efcd1db59e43c53b.tar.gz
Remove openvpn.inc from functions.inc since its just a subsystem that does not need to be present on all of the includes.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/functions.inc1
-rw-r--r--etc/inc/upgrade_config.inc2
-rwxr-xr-xetc/rc.bootup3
3 files changed, 2 insertions, 4 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
+?>
OpenPOWER on IntegriCloud