oneclickvirt/pve
1
1
Fork 0
mirror of https://github.com/oneclickvirt/pve.git synced 2024-11-10 09:12:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

2024.02.18

Browse source
This commit is contained in:
spiritlhl 2024-02-18 10:45:07 +00:00
parent a68b08d29f
commit 40e750acde
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -15,7 +15,7 @@
2024.02.18 2024.02.18
- 修复低版本PVE删除非企业订阅弹窗可能失效的问题 - 修复低版本PVE删除非企业订阅弹窗可能失效的问题
- 测试发现ARM架构下纯IPV6的容器开设有问题，待修复 - 尝试修复ARM架构下纯IPV6的容器开设有问题
[更新日志](CHANGELOG.md) [更新日志](CHANGELOG.md)

2
scripts/buildct.sh
View file

@ -305,8 +305,6 @@ else
fi fi
pct start $CTID pct start $CTID
pct set $CTID --hostname $CTID pct set $CTID --hostname $CTID
# # 删除原始配置避免重启容器后出现内网IPV4错配的情况
# pct exec $CTID -- sed -i '/auto eth0/,$d' /etc/network/interfaces
if [ "$independent_ipv6" == "y" ]; then if [ "$independent_ipv6" == "y" ]; then
if [ ! -z "$host_ipv6_address" ] && [ ! -z "$ipv6_prefixlen" ] && [ ! -z "$ipv6_gateway" ] && [ ! -z "$ipv6_address_without_last_segment" ]; then if [ ! -z "$host_ipv6_address" ] && [ ! -z "$ipv6_prefixlen" ] && [ ! -z "$ipv6_gateway" ] && [ ! -z "$ipv6_address_without_last_segment" ]; then
if grep -q "vmbr2" /etc/network/interfaces; then if grep -q "vmbr2" /etc/network/interfaces; then

8
scripts/buildct_onlyv6.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# from # from
# https://github.com/spiritLHLS/pve # https://github.com/spiritLHLS/pve
# 2024.02.17 # 2024.02.18
# ./buildct_onlyv6.sh CTID 密码 CPU核数 内存 硬盘 系统 存储盘 # ./buildct_onlyv6.sh CTID 密码 CPU核数 内存 硬盘 系统 存储盘
# ./buildct_onlyv6.sh 102 1234567 1 512 5 debian11 local # ./buildct_onlyv6.sh 102 1234567 1 512 5 debian11 local
@ -263,6 +263,8 @@ fi
if [ -f /usr/local/bin/pve_ipv6_gateway ]; then if [ -f /usr/local/bin/pve_ipv6_gateway ]; then
ipv6_gateway=$(cat /usr/local/bin/pve_ipv6_gateway) ipv6_gateway=$(cat /usr/local/bin/pve_ipv6_gateway)
fi fi
user_ip="172.16.1.${num}"
if [ "$system_arch" = "x86" ]; then if [ "$system_arch" = "x86" ]; then
if [ "$fixed_system" = true ]; then if [ "$fixed_system" = true ]; then
pct create $CTID /var/lib/vz/template/cache/$system_name -cores $core -cpuunits 1024 -memory $memory -swap 128 -rootfs ${storage}:${disk} -onboot 1 -password $password -features nesting=1 pct create $CTID /var/lib/vz/template/cache/$system_name -cores $core -cpuunits 1024 -memory $memory -swap 128 -rootfs ${storage}:${disk} -onboot 1 -password $password -features nesting=1
@ -275,10 +277,6 @@ else
fi fi
pct start $CTID pct start $CTID
pct set $CTID --hostname $CTID pct set $CTID --hostname $CTID
# # 删除原始配置避免重启容器后出现内网IPV4错配的情况
# pct exec $CTID -- sed -i '/auto eth0/,$d' /etc/network/interfaces
# arm架构下纯IPV6开设有问题
user_ip="172.16.1.${num}"
pct set $CTID --net0 name=eth0,ip6="${ipv6_address_without_last_segment}${CTID}/128",bridge=vmbr2,gw6="${host_ipv6_address}" pct set $CTID --net0 name=eth0,ip6="${ipv6_address_without_last_segment}${CTID}/128",bridge=vmbr2,gw6="${host_ipv6_address}"
pct set $CTID --net1 name=eth1,ip=${user_ip}/24,bridge=vmbr1,gw=172.16.1.1 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 pct set $CTID --nameserver 8.8.8.8,2001:4860:4860::8888 --nameserver 8.8.4.4,2001:4860:4860::8844