(legacy) remove reload_interfaces_sync and move functionality to rc scripts

This commit is contained in:
Ad Schellevis 2015-07-22 12:55:39 +00:00
parent abcec63fc1
commit 3fd45bad23
3 changed files with 10 additions and 24 deletions

View File

@ -285,28 +285,6 @@ function host_firmware_version()
}
/****f* legacy/reload_interfaces_sync
* NAME
* reload_interfaces - reload all interfaces
* INPUTS
* none
* RESULT
* none
******/
function reload_interfaces_sync()
{
global $config;
/* parse config.xml again */
$config = parse_config();
/* enable routing */
system_routing_enable();
/* set up interfaces */
interfaces_configure();
}
/****f* legacy/reload_all
* NAME
* reload_all - triggers a reload of all settings

View File

@ -37,10 +37,15 @@ require_once("ipsec.inc");
require_once("vpn.inc");
require_once("captiveportal.inc");
require_once("rrd.inc");
require_once("system.inc");
require_once("interfaces.inc");
if (set_networking_interfaces_ports()) {
echo "Reloading interfaces...";
reload_interfaces_sync();
global $config;
$config = parse_config();
system_routing_enable();
interfaces_configure();
echo "done.\n";
enable_rrd_graphing();
}

View File

@ -34,8 +34,11 @@ require_once("util.inc");
require_once("openvpn.inc");
require_once("vpn.inc");
require_once("captiveportal.inc");
require_once("system.inc");
require_once("interfaces.inc");
reload_interfaces_sync();
system_routing_enable();
interfaces_configure();
filter_configure_sync();
/* XXX: needs fixing */
//ovpn_config_server("pfreload");