From 504100448b020320b34af442b0223040e666ba21 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sat, 3 Dec 2005 01:56:17 +0000 Subject: Use /tmp/reload_interfaces --- usr/local/www/interfaces.php | 6 +----- usr/local/www/interfaces_lan.php | 15 ++------------- usr/local/www/interfaces_opt.php | 7 ++----- usr/local/www/interfaces_wan.php | 6 +----- 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 9f63556..a3f7591 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -279,12 +279,8 @@ if ($_POST) { write_config(); $retval = 0; - config_lock(); - $retval = interfaces_wan_configure(); - config_unlock(); - /* setup carp interfaces */ - interfaces_carp_configure(); + touch("/tmp/reload_interfaces"); $savemsg = get_std_save_message($retval); } diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index a4da8ae..a0201fd 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -293,21 +293,10 @@ function enable_change(enable_over) { if ($_POST['apply'] <> "") { - /* Change these items late in the script - * so the script will fully complete to - * the users web browser - */ - - /* set up LAN interface */ - interfaces_lan_configure(); - - interfaces_vlan_configure(); - - /* setup carp interfaces */ - interfaces_carp_configure(); + touch("/tmp/reload_interfaces"); unlink($d_landirty_path); } -?> +?> \ No newline at end of file diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php index 75dbf46..e18984e 100755 --- a/usr/local/www/interfaces_opt.php +++ b/usr/local/www/interfaces_opt.php @@ -212,17 +212,14 @@ if ($_POST) { write_config(); - $retval = interfaces_optional_configure(); - /* is this the captive portal interface? */ if (isset($config['captiveportal']['enable']) && ($config['captiveportal']['interface'] == ('opt' . $index))) { captiveportal_configure(); } - /* setup carp interfaces */ - interfaces_carp_configure(); - + touch("/tmp/reload_interfaces"); + /* sync filter configuration */ filter_configure(); diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php index 9f63556..a3f7591 100755 --- a/usr/local/www/interfaces_wan.php +++ b/usr/local/www/interfaces_wan.php @@ -279,12 +279,8 @@ if ($_POST) { write_config(); $retval = 0; - config_lock(); - $retval = interfaces_wan_configure(); - config_unlock(); - /* setup carp interfaces */ - interfaces_carp_configure(); + touch("/tmp/reload_interfaces"); $savemsg = get_std_save_message($retval); } -- cgit v1.1