diff options
| author | Ermal <eri@pfsense.org> | 2010-07-21 20:50:58 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-07-21 20:50:58 +0000 |
| commit | 5c49cf58c79f6d3c22182e1a4139be82df1bfa80 (patch) | |
| tree | 06458a8ed23879071c96a8d25a246c594941366e /etc | |
| parent | 64e6490a7b852c04e3448c83e3dd31ab6d5f5952 (diff) | |
| download | pfsense-5c49cf58c79f6d3c22182e1a4139be82df1bfa80.zip pfsense-5c49cf58c79f6d3c22182e1a4139be82df1bfa80.tar.gz | |
Ticket #667. Actually destroy when trying to reconfigure an interface.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index aaeef0b..64e3b37 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -822,8 +822,7 @@ function interface_bring_down($interface = "wan", $destroy = false) { killbypid("{$g['varrun_path']}/{$ifcfg['ipaddr']}_{$interface}.pid"); sleep(2); unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf"); - if (isset($ppp['ondemand'])) { - $destroy = false; + if (isset($ppp['ondemand']) && !$destroy) { interface_configure("wan"); } break; @@ -2229,7 +2228,7 @@ function interface_configure($interface = "wan", $reloadall = false) { if (!$g['booting']) { /* remove all IPv4 addresses */ while (mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " -alias", true) == 0); - interface_bring_down($interface); + interface_bring_down($interface, true); } /* wireless configuration? */ |
