From fde78de2f799834b742d23fb45acf36f186d3f37 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Sat, 12 Apr 2025 15:44:20 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E4=BF=AE=E5=A4=8D=E7=BA=AF=20IPv6=20?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD=E9=83=A8=E5=88=86=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20#317?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

dl.fedoraproject.org 不支持 IPv6
---
 reinstall.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/reinstall.sh b/reinstall.sh
index d32a4ee..7566077 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -1249,7 +1249,7 @@ Continue?
             fi
 
             # iso
-            filename=$(curl -L $mirror | grep -oP "ubuntu-$releasever.*?-live-server-$basearch_alt.iso" |
+            filename=$(curl -L $mirror/ | grep -oP "ubuntu-$releasever.*?-live-server-$basearch_alt.iso" |
                 sort -uV | tail -1 | grep .)
             iso=$mirror/$filename
             # 在 ubuntu 20.04 上，file 命令检测 ubuntu 22.04 iso 结果是 DOS/MBR boot sector
@@ -1559,7 +1559,7 @@ Continue with DD?
                 centos) ci_mirror="https://cloud.centos.org/centos" ;;
                 almalinux) ci_mirror="https://repo.almalinux.org/almalinux/$releasever/cloud/$basearch/images" ;;
                 rocky) ci_mirror="https://download.rockylinux.org/pub/rocky/$releasever/images/$basearch" ;;
-                fedora) ci_mirror="https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Cloud/$basearch/images" ;;
+                fedora) ci_mirror="https://d2lzkl7pfhq30w.cloudfront.net/pub/fedora/linux/releases/$releasever/Cloud/$basearch/images" ;;
                 esac
             fi
             case $distro in
@@ -1583,7 +1583,10 @@ Continue with DD?
             almalinux) ci_image=$ci_mirror/AlmaLinux-$releasever-GenericCloud-latest.$basearch.qcow2 ;;
             rocky) ci_image=$ci_mirror/Rocky-$releasever-GenericCloud-Base.latest.$basearch.qcow2 ;;
             fedora)
-                filename=$(curl -L $ci_mirror | grep -oP "Fedora-Cloud-Base-Generic.*?.qcow2" |
+                # 不加 / 会跳转到 https://dl.fedoraproject.org，纯 ipv6 无法访问
+                # curl -L -6 https://d2lzkl7pfhq30w.cloudfront.net/pub/fedora/linux/releases/41/Cloud/x86_64/images
+                # curl -L -6 https://d2lzkl7pfhq30w.cloudfront.net/pub/fedora/linux/releases/41/Cloud/x86_64/images/
+                filename=$(curl -L $ci_mirror/ | grep -oP "Fedora-Cloud-Base-Generic.*?.qcow2" |
                     sort -uV | tail -1 | grep .)
                 ci_image=$ci_mirror/$filename
                 ;;
@@ -1752,6 +1755,11 @@ is_distro_like_debian() {
     [ "$_distro" = debian ] || [ "$_distro" = kali ]
 }
 
+get_latest_distro_releasever() {
+    get_function_content verify_os_name |
+        grep -wo "$1 [^'\"]*" | awk -F'|' '{print $NF}'
+}
+
 # 检查是否为正确的系统名
 verify_os_name() {
     if [ -z "$*" ]; then
@@ -2670,13 +2678,16 @@ install_grub_linux_efi() {
     # fcix 经常 404
     # https://mirror.fcix.net/opensuse/tumbleweed/repo/oss/EFI/BOOT/bootx64.efi
     # https://mirror.fcix.net/opensuse/tumbleweed/appliances/openSUSE-Tumbleweed-Minimal-VM.x86_64-Cloud.qcow2
+
+    # dl.fedoraproject.org 不支持 ipv6
+
     if [ "$efi_distro" = fedora ]; then
-        fedora_ver=41
+        fedora_ver=$(get_latest_distro_releasever fedora)
 
         if is_in_china; then
             mirror=https://mirror.nju.edu.cn/fedora
         else
-            mirror=https://dl.fedoraproject.org/pub/fedora/linux
+            mirror=https://d2lzkl7pfhq30w.cloudfront.net/pub/fedora/linux
         fi
 
         curl -Lo $tmp/$grub_efi $mirror/releases/$fedora_ver/Everything/$basearch/os/EFI/BOOT/$grub_efi
@@ -4015,8 +4026,7 @@ if is_netboot_xyz ||
     setos nextos $distro $releasever
 else
     # alpine 作为中间系统时，使用最新版
-    alpine_ver_for_trans=$(get_function_content verify_os_name |
-        grep -o 'alpine[ 0-9\.\|]*' | awk -F'|' '{print $NF}')
+    alpine_ver_for_trans=$(get_latest_distro_releasever alpine)
     setos finalos $distro $releasever
     setos nextos alpine $alpine_ver_for_trans
 fi