diff --git a/CHANGELOG.md b/CHANGELOG.md index d092ae8..67ff1f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +2023.10.03 + +- 修复开设带IPV6地址的虚拟机时,网关顺序错配的问题 +- 更新开设出的虚拟机的nameserver和searchdomain设置,避免某些机器在解析域名时出错 + 2023.09.16 - 修复DNS修补过程中可能存在的判断漏洞 diff --git a/README.md b/README.md index 3713891..58735aa 100644 --- a/README.md +++ b/README.md @@ -8,16 +8,14 @@ 待开发内容: -- 国内宿主机开设容器/虚拟机时,由于网络与官方的包管理源链接非常不通畅,需要使用镜像链接替换或CDN加速整体链接 - KVM/LXC模板加载部分自定义的限制,避免机器用于滥用发包 - LXC模板构建自定义的模板提前初始化好部分内容,避免原始模板过于干净导致初始化时间过长 ## 更新 -2023.10.03 +2023.10.09 -- 修复开设带IPV6地址的虚拟机时,网关顺序错配的问题 -- 更新开设出的虚拟机的nameserver和searchdomain设置,避免某些机器在解析域名时出错 +- 修复国内宿主机开设容器时,由于网络与官方的包管理源链接非常不通畅,使用第三方镜像地址加速 [更新日志](CHANGELOG.md) diff --git a/scripts/buildct.sh b/scripts/buildct.sh index 078c046..b62417f 100644 --- a/scripts/buildct.sh +++ b/scripts/buildct.sh @@ -1,7 +1,7 @@ #!/bin/bash # from # https://github.com/spiritLHLS/pve -# 2023.08.23 +# 2023.10.09 # ./buildct.sh CTID 密码 CPU核数 内存 硬盘 SSH端口 80端口 443端口 外网端口起 外网端口止 系统 存储盘 独立IPV6 # ./buildct.sh 102 1234567 1 512 5 20001 20002 20003 30000 30025 debian11 local N @@ -283,14 +283,33 @@ if [ "$independent_ipv6_status" == "N" ]; then fi sleep 3 if echo "$system" | grep -qiE "centos|almalinux|rockylinux"; then - pct exec $CTID -- yum update -y - pct exec $CTID -- yum update - pct exec $CTID -- yum install -y dos2unix curl + pct exec $CTID -- yum install -y curl + if [[ -z "${CN}" || "${CN}" != true ]]; then + pct exec $CTID -- yum update -y + pct exec $CTID -- yum update + pct exec $CTID -- yum install -y dos2unix curl + else + pct exec $CTID -- yum install -y curl + pct exec $CTID -- curl -lk https://gitee.com/SuperManito/LinuxMirrors/raw/main/ChangeMirrors.sh -o ChangeMirrors.sh + pct exec $CTID -- chmod 777 ChangeMirrors.sh + pct exec $CTID -- ./ChangeMirrors.sh --source mirrors.tuna.tsinghua.edu.cn --web-protocol http --intranet false --close-firewall true --backup true --updata-software false --clean-cache false --ignore-backup-tips + pct exec $CTID -- rm -rf ChangeMirrors.sh + pct exec $CTID -- yum install -y dos2unix + fi else - pct exec $CTID -- apt-get update -y - pct exec $CTID -- dpkg --configure -a - pct exec $CTID -- apt-get update - pct exec $CTID -- apt-get install dos2unix curl -y + if [[ -z "${CN}" || "${CN}" != true ]]; then + pct exec $CTID -- apt-get update -y + pct exec $CTID -- dpkg --configure -a + pct exec $CTID -- apt-get update + pct exec $CTID -- apt-get install dos2unix curl -y + else + pct exec $CTID -- apt-get install curl -y --fix-missing + pct exec $CTID -- curl -lk https://gitee.com/SuperManito/LinuxMirrors/raw/main/ChangeMirrors.sh -o ChangeMirrors.sh + pct exec $CTID -- chmod 777 ChangeMirrors.sh + pct exec $CTID -- ./ChangeMirrors.sh --source mirrors.tuna.tsinghua.edu.cn --web-protocol http --intranet false --close-firewall true --backup true --updata-software false --clean-cache false --ignore-backup-tips + pct exec $CTID -- rm -rf ChangeMirrors.sh + pct exec $CTID -- apt-get install dos2unix -y + fi fi pct exec $CTID -- curl -L ${cdn_success_url}https://raw.githubusercontent.com/spiritLHLS/pve/main/scripts/ssh.sh -o ssh.sh pct exec $CTID -- chmod 777 ssh.sh diff --git a/scripts/buildct_onlyv6.sh b/scripts/buildct_onlyv6.sh index fda2370..c53e358 100644 --- a/scripts/buildct_onlyv6.sh +++ b/scripts/buildct_onlyv6.sh @@ -1,7 +1,7 @@ #!/bin/bash # from # https://github.com/spiritLHLS/pve -# 2023.08.23 +# 2023.10.09 # ./buildct_onlyv6.sh CTID 密码 CPU核数 内存 硬盘 系统 存储盘 # ./buildct_onlyv6.sh 102 1234567 1 512 5 debian11 local @@ -228,14 +228,32 @@ pct set $CTID --net1 name=eth1,ip=${user_ip}/24,bridge=vmbr1,gw=172.16.1.1 pct set $CTID --nameserver 8.8.8.8,2001:4860:4860::8888 --nameserver 8.8.4.4,2001:4860:4860::8844 sleep 3 if echo "$system" | grep -qiE "centos|almalinux|rockylinux" >/dev/null 2>&1; then - pct exec $CTID -- yum update -y - pct exec $CTID -- yum update - pct exec $CTID -- yum install -y dos2unix curl + if [[ -z "${CN}" || "${CN}" != true ]]; then + pct exec $CTID -- yum update -y + pct exec $CTID -- yum update + pct exec $CTID -- yum install -y dos2unix curl + else + pct exec $CTID -- yum install -y curl + pct exec $CTID -- curl -lk https://gitee.com/SuperManito/LinuxMirrors/raw/main/ChangeMirrors.sh -o ChangeMirrors.sh + pct exec $CTID -- chmod 777 ChangeMirrors.sh + pct exec $CTID -- ./ChangeMirrors.sh --source mirrors.tuna.tsinghua.edu.cn --web-protocol http --intranet false --close-firewall true --backup true --updata-software false --clean-cache false --ignore-backup-tips + pct exec $CTID -- rm -rf ChangeMirrors.sh + pct exec $CTID -- yum install -y dos2unix + fi else - pct exec $CTID -- apt-get update -y - pct exec $CTID -- dpkg --configure -a - pct exec $CTID -- apt-get update - pct exec $CTID -- apt-get install dos2unix curl -y + if [[ -z "${CN}" || "${CN}" != true ]]; then + pct exec $CTID -- apt-get update -y + pct exec $CTID -- dpkg --configure -a + pct exec $CTID -- apt-get update + pct exec $CTID -- apt-get install dos2unix curl -y + else + pct exec $CTID -- apt-get install curl -y --fix-missing + pct exec $CTID -- curl -lk https://gitee.com/SuperManito/LinuxMirrors/raw/main/ChangeMirrors.sh -o ChangeMirrors.sh + pct exec $CTID -- chmod 777 ChangeMirrors.sh + pct exec $CTID -- ./ChangeMirrors.sh --source mirrors.tuna.tsinghua.edu.cn --web-protocol http --intranet false --close-firewall true --backup true --updata-software false --clean-cache false --ignore-backup-tips + pct exec $CTID -- rm -rf ChangeMirrors.sh + pct exec $CTID -- apt-get install dos2unix -y + fi fi pct exec $CTID -- curl -L ${cdn_success_url}https://raw.githubusercontent.com/spiritLHLS/pve/main/scripts/ssh.sh -o ssh.sh pct exec $CTID -- chmod 777 ssh.sh