From 665f976a87cefd8967dd90b5478c88fab1e78999 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Sat, 24 Aug 2024 17:28:17 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E4=BF=AE=E5=A4=8D=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E6=9C=BA=E5=99=A8=E8=AF=AF=E5=88=A4=E4=B8=BA=20IPv6=20?=
 =?UTF-8?q?=E4=B8=8D=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原因是用了 ping dnspod 公共 IPv6 DNS 作为连通性检测
但是这个 DNS 禁 ping
---
 README.en.md      | 2 +-
 README.md         | 2 +-
 alpine-network.sh | 8 ++++----
 reinstall.sh      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.en.md b/README.en.md
index 63b97c4..3c7c95d 100644
--- a/README.en.md
+++ b/README.en.md
@@ -151,7 +151,7 @@ bash reinstall.sh centos      9
 
 ### Feature 2: DD
 
-- Supports `raw` `vhd` `gzip` and `xz` formatted images
+- Supports `raw`, `vhd`, `gzip` and `xz` formatted images
 - When using DD with a Windows image, the script will automatically expand the system partition. For static IP machines, the IP will be configured automatically, and it may take a few minutes to take effect on first boot
 
 ```bash
diff --git a/README.md b/README.md
index a3a8fd8..ccdd652 100644
--- a/README.md
+++ b/README.md
@@ -151,7 +151,7 @@ bash reinstall.sh centos      9
 
 ### 功能 2: DD
 
-- 支持 `raw` `vhd` `gzip`、`xz` 格式的镜像
+- 支持 `raw`、`vhd`、`gzip`、`xz` 格式的镜像
 - DD Windows 镜像时，会自动扩展系统盘。静态的机器会自动配置好 IP，可能首次开机几分钟后才生效
 
 ```bash
diff --git a/alpine-network.sh b/alpine-network.sh
index 3045c4c..45ab090 100644
--- a/alpine-network.sh
+++ b/alpine-network.sh
@@ -10,10 +10,10 @@ ipv6_gateway=$5
 is_in_china=$6
 
 if $is_in_china; then
-    ipv4_dns1='119.29.29.29'
-    ipv4_dns2='223.5.5.5'
-    ipv6_dns1='2402:4e00::'
-    ipv6_dns2='2400:3200::1'
+    ipv4_dns1='223.5.5.5'
+    ipv4_dns2='119.29.29.29'
+    ipv6_dns1='2400:3200::1'
+    ipv6_dns2='2402:4e00::'
 else
     ipv4_dns1='1.1.1.1'
     ipv4_dns2='8.8.8.8'
diff --git a/reinstall.sh b/reinstall.sh
index fdee127..84548e5 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -247,8 +247,8 @@ test_url_real() {
     echo $url
     for i in $(seq 5 -1 0); do
         if command curl --insecure --connect-timeout 10 -Lfr 0-1048575 "$url" \
-            1> >(dd bs=1M count=1 of=$tmp_file iflag=fullblock 2>/dev/null) \
-            2> >(grep -v 'curl: (23)' >&2); then
+            1> >(exec dd bs=1M count=1 of=$tmp_file iflag=fullblock 2>/dev/null) \
+            2> >(exec grep -v 'curl: (23)' >&2); then
             break
         else
             ret=$?