summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-05-07 12:34:11 +0000
committerErmal <eri@pfsense.org>2013-05-07 12:34:11 +0000
commit982e004f0ae0ae89f627e879be0f355001ae2f5d (patch)
tree8d496f0cf3adb7bd20922b4db7912e16a5d06640
parent70a99e87f748f234b8dc8ee7a5fdd0f144fff984 (diff)
downloadpfsense-982e004f0ae0ae89f627e879be0f355001ae2f5d.zip
pfsense-982e004f0ae0ae89f627e879be0f355001ae2f5d.tar.gz
Pull code from the calling place rather than the interfaces.inc
-rw-r--r--etc/inc/interfaces.inc2
-rwxr-xr-xetc/rc.linkup2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 705457b..09f21a9 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -45,8 +45,6 @@
require_once("globals.inc");
require_once("util.inc");
require_once("gwlb.inc");
-require_once("vpn.inc");
-require_once("captiveportal.inc");
function interfaces_bring_up($interface) {
if(!$interface) {
diff --git a/etc/rc.linkup b/etc/rc.linkup
index 4dc3058..0c6db18 100755
--- a/etc/rc.linkup
+++ b/etc/rc.linkup
@@ -73,6 +73,8 @@ function handle_argument_group($iface, $argument2) {
case "up":
log_error("DEVD Ethernet attached event for {$iface}");
log_error("HOTPLUG: Configuring interface {$iface}");
+ require_once("vpn.inc");
+ require_once("captiveportal.inc");
// Do not try to readd to bridge otherwise em(4) has problems
interface_configure($iface, true, true);
break;
OpenPOWER on IntegriCloud