summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErik Fonnesbeck <efonnes@gmail.com>2010-09-03 18:58:45 -0600
committerErik Fonnesbeck <efonnes@gmail.com>2010-09-03 18:58:45 -0600
commit3896d93ec5b2d28ed4f6fdbcfbfc032ddf9c564d (patch)
tree33d15110ffeec7e9b1024fa6592e7317bdea4518 /etc
parent0a28d38599ab095a88f509ae307c9ba06cb4bd04 (diff)
downloadpfsense-3896d93ec5b2d28ed4f6fdbcfbfc032ddf9c564d.zip
pfsense-3896d93ec5b2d28ed4f6fdbcfbfc032ddf9c564d.tar.gz
Do this check earlier rather than later, instead of moving the interface_bring_down call.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/interfaces.inc13
1 files changed, 12 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index cd7234b..6705a52 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2350,7 +2350,18 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
if (!$g['booting']) {
/* remove all IPv4 addresses */
while (mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " -alias", true) == 0);
- interface_bring_down($interface, true);
+
+ switch ($wancfg['ipaddr']) {
+ case 'pppoe':
+ case 'l2tp':
+ case 'pptp':
+ case 'ppp':
+ interface_bring_down($interface, true);
+ break;
+ default:
+ interface_bring_down($interface);
+ break;
+ }
}
/* wireless configuration? */
OpenPOWER on IntegriCloud