summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-01-21 10:38:00 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-01-21 10:38:00 -0200
commit43045948c8de6758d72e02d4251ae4d143c9e934 (patch)
tree499be86ecda139a44e73d021f57070f99b8f0689 /usr
parentaefc6bc2f71e1dc6726811905508c587ee33e8b5 (diff)
downloadpfsense-43045948c8de6758d72e02d4251ae4d143c9e934.zip
pfsense-43045948c8de6758d72e02d4251ae4d143c9e934.tar.gz
Revert "Fix #3350. Do not destroy an interface when it's being disabled"
Ermal reported issues when changes are made on VLAN parent interface with this patch. He did other changes and interface_configure() will now be able to re-create VLAN interface This reverts commit f70a140fe18cb80012e53f82c268788fbcae5436.
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/interfaces.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 51c2a02..548e859 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -359,9 +359,11 @@ if ($_POST['apply']) {
if (file_exists("{$g['tmp_path']}/.interfaces.apply")) {
$toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.interfaces.apply"));
foreach ($toapplylist as $ifapply => $ifcfgo) {
- interface_bring_down($ifapply, false, $ifcfgo);
- if (isset($config['interfaces'][$ifapply]['enable']))
+ if (isset($config['interfaces'][$ifapply]['enable'])) {
+ interface_bring_down($ifapply, false, $ifcfgo);
interface_configure($ifapply, true);
+ } else
+ interface_bring_down($ifapply, true, $ifcfgo);
}
}
/* restart snmp so that it binds to correct address */
OpenPOWER on IntegriCloud