From 7b44d71aca7b4c7597ac463be9f630e75af4b604 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Mon, 12 Aug 2024 22:28:22 +0800
Subject: [PATCH] =?UTF-8?q?opensuse:=20=E6=9B=B4=E6=94=B9=E5=9B=BD?=
 =?UTF-8?q?=E5=A4=96=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fcix 镜像经常 404
---
 reinstall.sh | 12 ++++++++----
 trans.sh     |  4 +---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/reinstall.sh b/reinstall.sh
index 5ae636a..8d4f0b0 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -995,7 +995,7 @@ setos() {
         if is_in_china; then
             mirror=https://mirror.sjtu.edu.cn/opensuse
         else
-            mirror=https://mirror.fcix.net/opensuse
+            mirror=https://provo-mirror.opensuse.org
         fi
 
         if [ "$releasever" = tumbleweed ]; then
@@ -1085,7 +1085,7 @@ Continue with DD?
                 "centos") ci_mirror="https://cloud.centos.org/centos" ;;
                 "alma") 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://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Cloud/$basearch/images" ;;
+                "fedora") ci_mirror="https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Cloud/$basearch/images" ;;
                 esac
             fi
             case $distro in
@@ -1997,13 +1997,17 @@ install_grub_linux_efi() {
     # 因为 ipv6 访问有时跳转到 ipv4 地址，造成 ipv6 only 机器无法下载
     # 日韩机器有时得到国内镜像源，但镜像源屏蔽了国外 IP 导致连不上
     # https://mirrors.bfsu.edu.cn/opensuse/ports/aarch64/tumbleweed/repo/oss/EFI/BOOT/grub.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
     if [ "$efi_distro" = fedora ]; then
         fedora_ver=40
 
         if is_in_china; then
             mirror=https://mirrors.ustc.edu.cn/fedora
         else
-            mirror=https://mirror.fcix.net/fedora/linux
+            mirror=https://dl.fedoraproject.org/pub/fedora/linux
         fi
 
         curl -Lo $tmp/$grub_efi $mirror/releases/$fedora_ver/Everything/$basearch/os/EFI/BOOT/$grub_efi
@@ -2011,7 +2015,7 @@ install_grub_linux_efi() {
         if is_in_china; then
             mirror=https://mirror.sjtu.edu.cn/opensuse
         else
-            mirror=https://mirror.fcix.net/opensuse
+            mirror=https://provo-mirror.opensuse.org
         fi
 
         [ "$basearch" = x86_64 ] && ports='' || ports=/ports/$basearch
diff --git a/trans.sh b/trans.sh
index 77499ad..e4e3af2 100644
--- a/trans.sh
+++ b/trans.sh
@@ -423,9 +423,7 @@ get_netconf_to() {
 }
 
 is_ipv4_has_internet() {
-    get_netconf_to ipv4_has_internet
-    # shellcheck disable=SC2154
-    [ "$ipv4_has_internet" = 1 ]
+    grep -q 1 /dev/netconf/*/ipv4_has_internet
 }
 
 is_in_china() {