From cf489d1633c9fa87bcc088a718c55f764cd25992 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 16 Aug 2021 18:23:57 +0200
Subject: [PATCH] Interfaces - console setup. minor cleanups and fixes for
 https://github.com/opnsense/core/pull/4499

---
 src/etc/inc/console.inc | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/etc/inc/console.inc b/src/etc/inc/console.inc
index b171918da..9fc0d1519 100644
--- a/src/etc/inc/console.inc
+++ b/src/etc/inc/console.inc
@@ -132,7 +132,7 @@ EOD;
 
     $ifnames = array_keys($iflist);
 
-        echo <<<EOD
+    echo <<<EOD
 
 You now have the opportunity to configure LAGGs.  If you don't require LAGGs
 for initial connectivity, say no here and use the GUI to configure LAGGs later.
@@ -153,16 +153,14 @@ EOD;
     if (isset($config['laggs']['lagg'][0])) {
         echo "\nLAGG interfaces:\n\n";
         foreach ($config['laggs']['lagg'] as $lagg) {
-            $members = implode(",", $lagg['members']);
             echo sprintf(
                 "% -16s%s\n",
                 "{$lagg['laggif']}",
-                "member interfaces {$members}"
+                "member interfaces {$lagg['members']}"
             );
             $iflist_all[$lagg['laggif']] = array();
-
-            if (!isset($iflist[$lagg['laggif']]))
-                $iflist[$lagg['laggif']] = $lagg;
+            // XXX: get_interface_list() doesn't return lagg interfaces.
+            $iflist[$lagg['laggif']] = ["up" => 1, "mac" => ""];
         }
     }
 
@@ -548,7 +546,6 @@ EOD;
         if (!is_array($iflist)) {
             echo "No interfaces found!\n";
         } else {
-            $lagg_capable = 0;
             foreach ($unused_ifs as $iface => $ifa) {
                 echo sprintf(
                     "% -8s%s%s\n",
@@ -556,11 +553,10 @@ EOD;
                     $ifa['mac'],
                     $ifa['up'] ? "   (up)" : ""
                 );
-                $lagg_capable++;
             }
         }
 
-        if ($lagg_capable == 0) {
+        if (empty($unused_ifs)) {
             echo "No LAGG-capable interfaces detected.\n";
             return;
         }
@@ -578,7 +574,7 @@ EOD;
                 continue;
             }
             $lagg['members'] = str_replace(" ", "", $members_str);
-            
+
             foreach($members as $member) {
                 unset($unused_ifs[$member]);
             }