gh_mirrors/reinstall
1
0
Fork 0
mirror of https://github.com/bin456789/reinstall.git synced 2025-01-19 04:49:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: 云镜像使用两种 dns 配置

Browse Source
This commit is contained in:
bin456789 2023-11-15 20:46:15 +08:00
parent 78937098a6
commit 56f5c90a26
No known key found for this signature in database
GPG Key ID: EE301B386DE6C11B
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
trans.sh
View File

@ -833,7 +833,8 @@ create_cloud_init_network_config() {
yq -i ".network.version=1 | yq -i ".network.version=1 |
.network.config[0].type=\"physical\" | .network.config[0].type=\"physical\" |
.network.config[0].name=\"eth0\" | .network.config[0].name=\"eth0\" |
.network.config[0].mac_address=\"$mac_addr\" .network.config[0].mac_address=\"$mac_addr\" |
.network.config[1].type=\"nameserver\"
" $ci_file " $ci_file
ip_index=0 ip_index=0
@ -851,9 +852,13 @@ create_cloud_init_network_config() {
\"gateway\": \"$ipv4_gateway\" } \"gateway\": \"$ipv4_gateway\" }
" $ci_file " $ci_file
# 旧版 cloud-init 有 bug
# 有的版本会只从第一种配置中读取 dns，有的从第二种读取
# 因此写两种配置
if dns4_list=$(get_current_dns_v4); then if dns4_list=$(get_current_dns_v4); then
for cur in $dns4_list; do for cur in $dns4_list; do
yq -i ".network.config[0].subnets[$ip_index].dns_nameservers += [\"$cur\"]" $ci_file yq -i ".network.config[0].subnets[$ip_index].dns_nameservers += [\"$cur\"]" $ci_file
yq -i ".network.config[1].address += [\"$cur\"]" $ci_file
done done
fi fi
ip_index=$((ip_index + 1)) ip_index=$((ip_index + 1))
@ -893,6 +898,7 @@ create_cloud_init_network_config() {
if is_need_manual_set_dnsv6 && dns6_list=$(get_current_dns_v6); then if is_need_manual_set_dnsv6 && dns6_list=$(get_current_dns_v6); then
for cur in $dns6_list; do for cur in $dns6_list; do
yq -i ".network.config[0].subnets[$ip_index].dns_nameservers += [\"$cur\"]" $ci_file yq -i ".network.config[0].subnets[$ip_index].dns_nameservers += [\"$cur\"]" $ci_file
yq -i ".network.config[1].address += [\"$cur\"]" $ci_file
done done
fi fi
} }