From def42d327739bb5b00a2ae114d64d24492d49f7b Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Sun, 22 Oct 2023 16:56:44 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E9=80=9A=E8=BF=87=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=BD=91=E5=85=B3=E5=BE=97=E5=88=B0=E9=BB=98=E8=AE=A4=E7=BD=91?=
 =?UTF-8?q?=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 reinstall.sh | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/reinstall.sh b/reinstall.sh
index 13e0e4a..894d775 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -798,19 +798,29 @@ collect_netconf() {
             break
         done
     else
-        nic_name=$(ip -o addr show scope global | head -1 | awk '{print $2}')
-        mac_addr=$(ip addr show scope global | grep link/ether | head -1 | awk '{print $2}')
-        ipv4_addr=$(ip -4 addr show scope global | grep inet | head -1 | awk '{print $2}')
-        ipv6_addr=$(ip -6 addr show scope global | grep inet6 | head -1 | awk '{print $2}')
-        ipv4_gateway=$(ip -4 route show default dev $nic_name | awk '{print $3}')
-        ipv6_gateway=$(ip -6 route show default dev $nic_name | awk '{print $3}')
+        # linux
+        # 通过默认网关得到默认网卡
+        for v in 4 6; do
+            if ethx=$(ip -$v route show default | head -1 | awk '{print $5}' | grep .); then
+                mac_addr=$(ip link show dev $ethx | grep link/ether | head -1 | awk '{print $2}')
+                break
+            fi
+        done
+
+        for v in 4 6; do
+            if ip -$v route show default dev $ethx | head -1 | grep -q .; then
+                eval ipv${v}_gateway="$(ip -$v route show default dev $ethx | head -1 | awk '{print $3}')"
+                eval ipv${v}_addr="$(ip -$v -o addr show scope global dev $ethx | head -1 | awk '{print $4}')"
+            fi
+        done
     fi
 
-    echo 1 $mac_addr
-    echo 2 $ipv4_addr
-    echo 3 $ipv4_gateway
-    echo 4 $ipv6_addr
-    echo 5 $ipv6_gateway
+    info "Network Info"
+    echo "MAC  Address: $mac_addr"
+    echo "IPv4 Address: $ipv4_addr"
+    echo "IPv4 Gateway: $ipv4_gateway"
+    echo "IPv6 Address: $ipv6_addr"
+    echo "IPv6 Gateway: $ipv6_gateway"
 }
 
 install_grub_win() {