From 8b0f702cd51a162e2d1bfceb28e741efc7fcd977 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 21 May 2018 18:02:41 +0200
Subject: [PATCH] interfaces: pass reload flag instead of guessing

PR: https://github.com/opnsense/core/pull/2337
---
 src/etc/inc/interfaces.inc | 5 +----
 src/etc/rc.bootup          | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 148adb66d..e821edd05 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -884,7 +884,7 @@ function interface_gif_configure(&$gif, $gifkey = "")
     return $gifif;
 }
 
-function interfaces_configure($verbose = false)
+function interfaces_configure($verbose = false, $reload = true)
 {
     global $config;
 
@@ -898,9 +898,6 @@ function interfaces_configure($verbose = false)
     $bridge_list = array();
     $track6_list = array();
 
-    /* This is needed to speedup interfaces on bootup. */
-    $reload = !file_exists('/var/run/booting');
-
     foreach ($iflist as $if => $ifname) {
         $realif = $config['interfaces'][$if]['if'];
         if (strstr($realif, "bridge")) {
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index 024f9b6be..17059132a 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -96,7 +96,7 @@ system_hosts_generate(true);
 system_syslogd_start(true);
 
 openvpn_prepare_all(true);
-interfaces_configure(true);
+interfaces_configure(true, false);
 
 system_resolvconf_generate(true);
 filter_configure_sync(true);