From 2862eaf0cc43321ba6574ca331e8066c6ae8d7bd Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 17 Jun 2022 09:29:23 +0200
Subject: [PATCH] interfaces: for specific device edit pages avoid reloading
 device again #5637

The device reconfigure is done unconditionally before configuring the attached
interface.  If we use reload we will configure the interface again, but if the
interface is disabled we wouldn't trigger the device creation.  So go back to
the former code which didn't exhibit any real issue before we used $reload.
---
 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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/www/interfaces_bridge_edit.php b/src/www/interfaces_bridge_edit.php
index 0e2f79108..8a5d57479 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, true);
+                interface_configure(false, $config);
             }
             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 182d8747d..a1f69bc65 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, true);
+                interface_configure(false, $confif);
             }
             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 5ebba6de3..a642d8b29 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, true);
+                interface_configure(false, $confif);
             }
             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 127e92da2..c4c544012 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, true);
+                interface_configure(false, $confif);
             }
             header(url_safe('Location: /interfaces_lagg.php'));
             exit;