From b5122830c9fe424be5ee01b522973137d59a4242 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Wed, 22 May 2024 21:42:43 +0800
Subject: [PATCH] =?UTF-8?q?centos:=20=E4=BF=AE=E5=A4=8D=E6=B2=A1=20ipv6=20?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=9A=84=E7=94=B2=E9=AA=A8=E6=96=87=E4=BA=91?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=20el9=20=E6=8E=89=E7=BA=BF=20(cloud-init=20?=
 =?UTF-8?q?=E7=9A=84=20bug)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trans.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/trans.sh b/trans.sh
index 0543e9b..e125b04 100644
--- a/trans.sh
+++ b/trans.sh
@@ -2184,9 +2184,6 @@ install_qcow_by_copy() {
     mkswap /dev/$xda*3
     swapon /dev/$xda*3
 
-    # cloud-init
-    download_cloud_init_config /os
-
     modify_el_ol() {
         # resolv.conf
         cp /etc/resolv.conf /os/etc/resolv.conf
@@ -2216,6 +2213,14 @@ install_qcow_by_copy() {
             chroot /os/ systemctl enable NetworkManager
         fi
 
+        # 修复 cloud-init 添加了 IPV*_FAILURE_FATAL
+        # 甲骨文 dhcp6 获取不到 IP 将视为 fatal，原有的 ipv4 地址也会被删除
+        insert_into_file $ci_file after '^runcmd:' <<EOF
+  - sed -i '/IPV4_FAILURE_FATAL/d' /etc/sysconfig/network-scripts/ifcfg-* || true
+  - sed -i '/IPV6_FAILURE_FATAL/d' /etc/sysconfig/network-scripts/ifcfg-* || true
+  - systemctl restart NetworkManager
+EOF
+
         # fstab 删除多余分区
         # alma/rocky 镜像有 boot 分区
         # oracle 镜像有 swap 分区
@@ -2401,11 +2406,17 @@ EOF
         restore_resolv_conf $os_dir
     }
 
+    # cloud-init
+    download_cloud_init_config /os
+
     case "$distro" in
     ubuntu) modify_ubuntu ;;
     *) modify_el_ol ;;
     esac
 
+    # 查看最终的 cloud-init 配置
+    cat /os/etc/cloud/cloud.cfg.d/99_*.cfg
+
     # 删除installer分区，重启后cloud init会自动扩容
     swapoff -a
     parted /dev/$xda -s rm 3