summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2013-05-07 05:32:03 -0700
committerErmal Luçi <eri@pfsense.org>2013-05-07 05:32:03 -0700
commit70a99e87f748f234b8dc8ee7a5fdd0f144fff984 (patch)
tree26dd4e1f096cd4271cb8b568b4d2220939a1240c /etc
parent252612d7dba66f4d152e39694d833e8eb05a2fb8 (diff)
parent8e47f55b6ec58fa287b9cfb0815aa47ff9d4b069 (diff)
downloadpfsense-70a99e87f748f234b8dc8ee7a5fdd0f144fff984.zip
pfsense-70a99e87f748f234b8dc8ee7a5fdd0f144fff984.tar.gz
Merge pull request #626 from phil-davis/master
Restore default route after HOTPLUG linkup
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/interfaces.inc2
-rwxr-xr-xetc/rc.linkup2
2 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 09f21a9..705457b 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -45,6 +45,8 @@
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 6283aa2..4dc3058 100755
--- a/etc/rc.linkup
+++ b/etc/rc.linkup
@@ -74,7 +74,7 @@ function handle_argument_group($iface, $argument2) {
log_error("DEVD Ethernet attached event for {$iface}");
log_error("HOTPLUG: Configuring interface {$iface}");
// Do not try to readd to bridge otherwise em(4) has problems
- interface_configure($iface, false, true);
+ interface_configure($iface, true, true);
break;
}
}
OpenPOWER on IntegriCloud