From 5ab8d279b982b3891aa8bbc46854338494ad91d6 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Mon, 13 Nov 2023 18:42:05 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E4=BA=91=E9=95=9C=E5=83=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=B0=86=E9=9D=99=E6=80=81=20dns=20=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B0=E7=BD=91=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

可修复 fedora (NetworkManager + resolved) 未渲染静态 dns
---
 trans.sh | 51 +++++++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/trans.sh b/trans.sh
index 6494844..41006da 100644
--- a/trans.sh
+++ b/trans.sh
@@ -829,34 +829,34 @@ create_cloud_init_network_config() {
     get_netconf_to mac_addr
     apk add yq
 
-    yq -i "
-        .network.version=1 |
-        .network.config[0].type=\"physical\" |
-        .network.config[0].name=\"eth0\" |
-        .network.config[0].mac_address=\"$mac_addr\"  |
-        .network.config[1].type=\"nameserver\"
-        " $ci_file
+    # shellcheck disable=SC2154
+    yq -i ".network.version=1 |
+           .network.config[0].type=\"physical\" |
+           .network.config[0].name=\"eth0\" |
+           .network.config[0].mac_address=\"$mac_addr\"
+           " $ci_file
+
+    ip_index=0
 
     # ipv4
     if is_dhcpv4; then
-        yq -i ".network.config[0].subnets += [{\"type\": \"dhcp4\"}]" $ci_file
-
+        yq -i ".network.config[0].subnets[$ip_index] = {\"type\": \"dhcp4\"}" $ci_file
+        ip_index=$((ip_index + 1))
     elif is_staticv4; then
         get_netconf_to ipv4_addr
         get_netconf_to ipv4_gateway
-
-        yq -i "
-            .network.config[0].subnets += [{
-                \"type\": \"static\",
-                \"address\": \"$ipv4_addr\",
-                \"gateway\": \"$ipv4_gateway\" }]
-                " $ci_file
+        yq -i ".network.config[0].subnets[$ip_index] = {
+                    \"type\": \"static\",
+                    \"address\": \"$ipv4_addr\",
+                    \"gateway\": \"$ipv4_gateway\" }
+                    " $ci_file
 
         if dns4_list=$(get_current_dns_v4); then
             for cur in $dns4_list; do
-                yq -i ".network.config[1].address += [\"$cur\"]" $ci_file
+                yq -i ".network.config[0].subnets[$ip_index].dns_nameservers += [\"$cur\"]" $ci_file
             done
         fi
+        ip_index=$((ip_index + 1))
     fi
 
     # ipv6
@@ -866,10 +866,10 @@ create_cloud_init_network_config() {
         else
             type=ipv6_slaac
         fi
-        yq -i ".network.config[0].subnets += [{\"type\": \"$type\"}]" $ci_file
+        yq -i ".network.config[0].subnets[$ip_index] = {\"type\": \"$type\"}" $ci_file
 
     elif is_dhcpv6; then
-        yq -i ".network.config[0].subnets += [{\"type\": \"ipv6_dhcpv6-stateful\"}]" $ci_file
+        yq -i ".network.config[0].subnets[$ip_index] = {\"type\": \"ipv6_dhcpv6-stateful\"}" $ci_file
 
     elif is_staticv6; then
         get_netconf_to ipv6_addr
@@ -882,18 +882,17 @@ create_cloud_init_network_config() {
         else
             type_ipv6_static=static6
         fi
-        yq -i "
-            .network.config[0].subnets += [{
-                \"type\": \"$type_ipv6_static\",
-                \"address\": \"$ipv6_addr\",
-                \"gateway\": \"$ipv6_gateway\" }]
-            " $ci_file
+        yq -i ".network.config[0].subnets[$ip_index] = {
+                    \"type\": \"$type_ipv6_static\",
+                    \"address\": \"$ipv6_addr\",
+                    \"gateway\": \"$ipv6_gateway\" }
+                    " $ci_file
     fi
 
     # 有 ipv6 但需设置 dns 的情况
     if is_need_manual_set_dnsv6 && dns6_list=$(get_current_dns_v6); then
         for cur in $dns6_list; do
-            yq -i ".network.config[1].address += [\"$cur\"]" $ci_file
+            yq -i ".network.config[0].subnets[$ip_index].dns_nameservers += [\"$cur\"]" $ci_file
         done
     fi
 }