From 3fd45bad236d6a9a1983e0280211a6a150fe68bc Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 22 Jul 2015 12:55:39 +0000
Subject: [PATCH] (legacy) remove reload_interfaces_sync and move functionality
 to rc scripts

---
 src/etc/inc/pfsense-utils.inc | 22 ----------------------
 src/etc/rc.initial.setports   |  7 ++++++-
 src/etc/rc.reload_interfaces  |  5 ++++-
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 1be4ce299..5db33c87e 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -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
diff --git a/src/etc/rc.initial.setports b/src/etc/rc.initial.setports
index 08edbb9c3..5df8ad773 100755
--- a/src/etc/rc.initial.setports
+++ b/src/etc/rc.initial.setports
@@ -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();
 }
diff --git a/src/etc/rc.reload_interfaces b/src/etc/rc.reload_interfaces
index 8f4e28800..b44ceae0d 100755
--- a/src/etc/rc.reload_interfaces
+++ b/src/etc/rc.reload_interfaces
@@ -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");