diff options
author | lgcosta <lgcosta@pfsense.org> | 2011-05-23 11:56:32 -0300 |
---|---|---|
committer | lgcosta <lgcosta@pfsense.org> | 2011-05-23 11:56:32 -0300 |
commit | 7a18dfa4ed218ad7b114d9cd52c008a76c811614 (patch) | |
tree | 0c0036bac569cf2921228e9596b14f808dcbc684 | |
parent | abcdca835cbce83d72d70bb957bbbf2118ae3d01 (diff) | |
download | pfsense-7a18dfa4ed218ad7b114d9cd52c008a76c811614.zip pfsense-7a18dfa4ed218ad7b114d9cd52c008a76c811614.tar.gz |
Fixes #1444. Implements the same fix that issue ermal made in #1522 to the console menu
-rw-r--r-- | etc/inc/interfaces.inc | 4 | ||||
-rwxr-xr-x | etc/rc.initial.setlanip | 2 | ||||
-rwxr-xr-x | usr/local/www/interfaces.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index dae5495..393833f 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -932,9 +932,9 @@ function interfaces_configure() { return 0; } -function interface_reconfigure($interface = "wan") { +function interface_reconfigure($interface = "wan", $reloadall = false) { interface_bring_down($interface); - interface_configure($interface, true); + interface_configure($interface, $reloadall); } function interface_vip_bring_down($vip) { diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index c1f6ddc..e95acd4 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -219,7 +219,7 @@ $upperifname = strtoupper($interface); echo "\nPlease wait, saving and activating your changes to {$upperifname}..."; write_config(gettext("{$interface} IP configuration from console menu")); - interface_configure(strtolower($upperifname)); + interface_reconfigure(strtolower($upperifname)); echo " Reloading filter..."; filter_configure_sync(); echo "\n"; diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index ead78cc..899e209 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -310,7 +310,7 @@ if ($_POST['apply']) { $toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.interfaces.apply")); foreach ($toapplylist as $ifapply) { if (isset($config['interfaces'][$ifapply]['enable'])) - interface_reconfigure($ifapply); + interface_reconfigure($ifapply, true); else interface_bring_down($ifapply); } |