From f588e8d0c48751a1d09de8e7c54db9d18cf4d45c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 30 Jun 2022 16:26:19 +0200
Subject: [PATCH] system: get rid of manual ifconfig invoke #4622

Likely tries to do what unassigning an interface should do.  Use
the actual function required.
---
 src/etc/inc/console.inc | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/etc/inc/console.inc b/src/etc/inc/console.inc
index 77d856c83..50e7f84d6 100644
--- a/src/etc/inc/console.inc
+++ b/src/etc/inc/console.inc
@@ -409,13 +409,10 @@ EOD;
         } elseif (isset($config['interfaces']['lan']['wireless'])) {
             unset($config['interfaces']['lan']['wireless']);
         }
-    } else {
-        if (isset($config['interfaces']['lan']['if'])) {
-            mwexec("/sbin/ifconfig " . $config['interfaces']['lan']['if'] . " delete");
-        }
-        if (isset($config['interfaces']['lan'])) {
-            unset($config['interfaces']['lan']);
-        }
+    } elseif (isset($config['interfaces']['lan'])) {
+        unset($config['interfaces']['lan']['enable']);
+        interface_bring_down('lan');
+
         if (isset($config['dhcpd']['lan'])) {
             unset($config['dhcpd']['lan']);
         }
@@ -428,6 +425,7 @@ EOD;
         if (isset($config['nat'])) {
             unset($config['nat']);
         }
+        unset($config['interfaces']['lan']);
     }
 
     if ($wanif) {
@@ -446,10 +444,8 @@ EOD;
         } elseif (isset($config['interfaces']['wan']['wireless'])) {
             unset($config['interfaces']['wan']['wireless']);
         }
-    } else {
-        if (isset($config['interfaces']['wan'])) {
-            unset($config['interfaces']['wan']);
-        }
+    } elseif (isset($config['interfaces']['wan'])) {
+        unset($config['interfaces']['wan']);
     }
 
     for ($i = 0; $i < count($optif); $i++) {