This commit is contained in:
spiritlhl 2023-07-30 14:19:28 +00:00
parent 9bada8e01b
commit 034b1f4251
2 changed files with 22 additions and 26 deletions

View file

@ -18,7 +18,6 @@
- 适配了ARM架构且已在hz的ARM机器上测试(Debian11及其更旧的系统)无问题,感谢[Proxmox-Arm64](https://github.com/jiangcuo/Proxmox-Arm64)提供的第三方补丁本项目目前支持X86_64架构和ARM架构了 - 适配了ARM架构且已在hz的ARM机器上测试(Debian11及其更旧的系统)无问题,感谢[Proxmox-Arm64](https://github.com/jiangcuo/Proxmox-Arm64)提供的第三方补丁本项目目前支持X86_64架构和ARM架构了
- 修改部分附加文件的存储位置至于```/usr/local/bin/```目录下 - 修改部分附加文件的存储位置至于```/usr/local/bin/```目录下
- CN的IP检测增加一个检测源对CN的特殊处理增加对APT源的特殊处理 - CN的IP检测增加一个检测源对CN的特殊处理增加对APT源的特殊处理
- 暂时去除AppArmor模块的检测和自动安装
[更新日志](CHANGELOG.md) [更新日志](CHANGELOG.md)

View file

@ -86,31 +86,28 @@ else
fi fi
fi fi
# # 检测AppArmor模块 # 检测AppArmor模块
# if ! dpkg -s apparmor > /dev/null 2>&1; then if ! dpkg -s apparmor > /dev/null 2>&1; then
# _green "AppArmor is being installed..." _green "AppArmor is being installed..."
# _green "正在安装 AppArmor..." _green "正在安装 AppArmor..."
# apt-get update apt-get update
# apt-get install -y apparmor apt-get install -y apparmor
# fi fi
# if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
# apt-get install -y apparmor --fix-missing apt-get install -y apparmor --fix-missing
# fi fi
# if ! systemctl is-active --quiet apparmor.service; then if ! systemctl is-active --quiet apparmor.service; then
# _green "Starting the AppArmor service..." _green "Starting the AppArmor service..."
# _green "启动 AppArmor 服务..." _green "启动 AppArmor 服务..."
# systemctl enable apparmor.service systemctl enable apparmor.service
# systemctl start apparmor.service systemctl start apparmor.service
# fi fi
# if ! lsmod | grep -q apparmor; then if ! lsmod | grep -q apparmor; then
# _green "Loading AppArmor kernel module..." _green "Loading AppArmor kernel module..."
# _green "正在加载 AppArmor 内核模块..." _green "正在加载 AppArmor 内核模块..."
# modprobe apparmor modprobe apparmor
# fi fi
# if ! lsmod | grep -q apparmor; then sleep 3
# _yellow "AppArmor is still not loaded, please execute reboot to reboot the system to load"
# _yellow "AppArmor 仍未加载,请执行 reboot 重新启动系统加载"
# fi
_yellow "Please execute reboot to reboot the system to load the PVE kernel." _yellow "Please execute reboot to reboot the system to load the PVE kernel."
_yellow "请执行 reboot 重新启动系统加载PVE内核" _yellow "请执行 reboot 重新启动系统加载PVE内核"
echo "1" > "/root/build_backend_pve.txt" echo "1" > "/root/build_backend_pve.txt"