From 90f471cb1999d2efca5319ad89074f499f53280e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 14 Jun 2022 14:14:21 +0200
Subject: [PATCH] interfaces: remove /var/run/booting side effect #5637

interfaces_configure() is unaffected.  While looking at the code
decided to make all callers except newwanip and vxlan hook use
$reload to request a full reconfiguration as that is most likely
what the user would expect in these cases in the first place.
---
 src/etc/inc/interfaces.inc         | 2 +-
 src/www/interfaces_bridge_edit.php | 2 +-
 src/www/interfaces_gif_edit.php    | 2 +-
 src/www/interfaces_gre_edit.php    | 2 +-
 src/www/interfaces_lagg_edit.php   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index a406dd26e..7c826f5f8 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2324,7 +2324,7 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
         echo "done.\n";
     }
 
-    if (!file_exists('/var/run/booting') && $reload) {
+    if ($reload) {
         system_routing_configure($verbose, $interface);
         plugins_configure('ipsec', $verbose, array($interface));
         plugins_configure('dhcp', $verbose);
diff --git a/src/www/interfaces_bridge_edit.php b/src/www/interfaces_bridge_edit.php
index 3ae9853c2..0e2f79108 100644
--- a/src/www/interfaces_bridge_edit.php
+++ b/src/www/interfaces_bridge_edit.php
@@ -225,7 +225,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             ifgroup_setup();
             $confif = convert_real_interface_to_friendly_interface_name($bridge['bridgeif']);
             if ($confif != '') {
-                interface_configure(false, $confif);
+                interface_configure(false, $confif, true);
             }
             header(url_safe('Location: /interfaces_bridge.php'));
             exit;
diff --git a/src/www/interfaces_gif_edit.php b/src/www/interfaces_gif_edit.php
index a1f69bc65..182d8747d 100644
--- a/src/www/interfaces_gif_edit.php
+++ b/src/www/interfaces_gif_edit.php
@@ -128,7 +128,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             ifgroup_setup();
             $confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
             if ($confif != '') {
-                interface_configure(false, $confif);
+                interface_configure(false, $confif, true);
             }
             header(url_safe('Location: /interfaces_gif.php'));
             exit;
diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php
index a642d8b29..5ebba6de3 100644
--- a/src/www/interfaces_gre_edit.php
+++ b/src/www/interfaces_gre_edit.php
@@ -98,7 +98,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             ifgroup_setup();
             $confif = convert_real_interface_to_friendly_interface_name($gre['greif']);
             if ($confif != '') {
-                interface_configure(false, $confif);
+                interface_configure(false, $confif, true);
             }
             header(url_safe('Location: /interfaces_gre.php'));
             exit;
diff --git a/src/www/interfaces_lagg_edit.php b/src/www/interfaces_lagg_edit.php
index c4c544012..127e92da2 100644
--- a/src/www/interfaces_lagg_edit.php
+++ b/src/www/interfaces_lagg_edit.php
@@ -169,7 +169,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             _interfaces_lagg_configure($lagg);
             $confif = convert_real_interface_to_friendly_interface_name($lagg['laggif']);
             if ($confif != '') {
-                interface_configure(false, $confif);
+                interface_configure(false, $confif, true);
             }
             header(url_safe('Location: /interfaces_lagg.php'));
             exit;