From 8ecf6c79a8f7b758092039e43d4356d4cf1edf0c Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:14:21 +0000 Subject: [PATCH] Update pve6.x --- README.md | 1 + scripts/install_pve.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fe3e009..89ad1d1 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ - 部分机器的IPV6物理接口使用auto类型,无法安装PVE,修改为static类型并重写配置 - 由于上面这条修复,已支持在Linode平台安装PVE了 - 修复低版本PVE还安装ifupdown2的问题,7.x以下版本使用ifupdown也足够了 +- 由于上面这条修复,Hetzner的Debian10系统可以安装PVE了 [更新日志](CHANGELOG.md) diff --git a/scripts/install_pve.sh b/scripts/install_pve.sh index 01c4466..347d501 100644 --- a/scripts/install_pve.sh +++ b/scripts/install_pve.sh @@ -103,6 +103,16 @@ else interface=${interface_1} fi mac_address=$(ip -o link show dev ${interface} | awk '{print $17}') +# 检查是否存在特定行 +if grep -Fxq "# /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg with the following:" /etc/network/interfaces.d/50-cloud-init && grep -Fxq "# network: {config: disabled}" /etc/network/interfaces.d/50-cloud-init; then + echo "Creating /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg." + if [ ! -f "/etc/cloud/cloud.cfg.d/99-disable-network-config.cfg" ]; then + echo "network: {config: disabled}" > /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg + _green "Please restart the system for the changes to take effect." + _green "请执行 reboot 重启系统后再次自行本脚本" + exit 1 + fi +fi check_cdn() { local o_url=$1 @@ -422,7 +432,7 @@ fi rm "$temp_file_apt_fix" output=$(apt-get update 2>&1) if echo $output | grep -q "NO_PUBKEY"; then - _yellow "try sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys missing key" + _yellow "try sudo apt-key adv --keyserver keyserver.ubuntu.com --recvrebuild_interface-keys missing key" exit 1 fi # 修复可能存在的auto类型