diff --git a/README.en.md b/README.en.md index 40f1dec..9943163 100644 --- a/README.en.md +++ b/README.en.md @@ -22,24 +22,25 @@ Reinstall server with one-click [中文](README.md) ## System Requirements -| Target System | Version | Memory | Disk | -| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ---------------------- | -| Alpine | 3.17, 3.18, 3.19, 3.20 | 256 MB | 1 GB | -| Debian | 9, 10, 11, 12 | 256 MB | 1 ~ 1.5 GB ^ | -| Kali | Rolling | 256 MB | 1 ~ 1.5 GB ^ | -| Ubuntu | 20.04, 22.04, 24.04 | 512 MB \* | 2 GB | -| CentOS | 9 | 512 MB \* | 5 GB | -| Anolis OS | 7, 8 | 512 MB \* | 5 GB | -| RedHat   Alma   Rocky   Oracle | 8, 9 | 512 MB \* | 5 GB | -| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB | -| Fedora | 39, 40 | 512 MB \* | 5 GB | -| openEuler | 20.03, 22.03, 24.03 | 512 MB \* | 5 GB | -| openSUSE | 15.5, 15.6, Tumbleweed (Rolling) | 512 MB \* | 5 GB | -| Arch | Rolling | 512 MB | 5 GB | -| Gentoo | Rolling | 512 MB | 5 GB | -| Windows (DD) | Any | 512 MB | Depending on the image | -| Windows (ISO) | Vista, 7, 8.x (Server 2008 ~ 2012 R2) | 512 MB | 25 GB | -| Windows (ISO) | 10, 11 (Server 2016 ~ 2025) | 1 GB | 25 GB | +| Target System | Version | Memory | Disk | +| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ---------------------- | +| Alpine | 3.17, 3.18, 3.19, 3.20 | 256 MB | 1 GB | +| Debian | 9, 10, 11, 12 | 256 MB | 1 ~ 1.5 GB ^ | +| Kali | Rolling | 256 MB | 1 ~ 1.5 GB ^ | +| Ubuntu | 20.04, 22.04, 24.04 | 512 MB \* | 2 GB | +| CentOS | 9 | 512 MB \* | 5 GB | +| Anolis | 7, 8 | 512 MB \* | 5 GB | +| RedHat   Alma   Rocky | 8, 9 | 512 MB \* | 5 GB | +| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB | +| Oracle | 7, 8, 9 | 512 MB \* | 5 GB | +| Fedora | 39, 40 | 512 MB \* | 5 GB | +| openEuler | 20.03, 22.03, 24.03 | 512 MB \* | 5 GB | +| openSUSE | 15.5, 15.6, Tumbleweed (Rolling) | 512 MB \* | 5 GB | +| Arch | Rolling | 512 MB | 5 GB | +| Gentoo | Rolling | 512 MB | 5 GB | +| Windows (DD) | Any | 512 MB | Depending on the image | +| Windows (ISO) | Vista, 7, 8.x (Server 2008 ~ 2012 R2) | 512 MB | 25 GB | +| Windows (ISO) | 10, 11 (Server 2016 ~ 2025) | 1 GB | 25 GB | (\*) Indicates installation using cloud images, not traditional network installation. @@ -148,9 +149,9 @@ bash reinstall.sh centos 9 anolis 7|8 alma 8|9 rocky 8|9 - oracle 8|9 redhat 8|9 --img='http://xxx.qcow2' opencloudos 8|9 + oracle 7|8|9 fedora 39|40 debian 9|10|11|12 openeuler 20.03|22.03|24.03 diff --git a/README.md b/README.md index 7909db9..cb7db5d 100644 --- a/README.md +++ b/README.md @@ -22,24 +22,25 @@ ## 配置要求 -| 目标系统 | 版本 | 内存 | 硬盘 | -| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ------------ | -| Alpine | 3.17, 3.18, 3.19, 3.20 | 256 MB | 1 GB | -| Debian | 9, 10, 11, 12 | 256 MB | 1 ~ 1.5 GB ^ | -| Kali | 滚动 | 256 MB | 1 ~ 1.5 GB ^ | -| Ubuntu | 20.04, 22.04, 24.04 | 512 MB \* | 2 GB | -| CentOS | 9 | 512 MB \* | 5 GB | -| Anolis OS | 7, 8 | 512 MB \* | 5 GB | -| RedHat   Alma   Rocky   Oracle | 8, 9 | 512 MB \* | 5 GB | -| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB | -| Fedora | 39, 40 | 512 MB \* | 5 GB | -| openEuler | 20.03, 22.03, 24.03 | 512 MB \* | 5 GB | -| openSUSE | 15.5, 15.6, Tumbleweed (滚动) | 512 MB \* | 5 GB | -| Arch | 滚动 | 512 MB | 5 GB | -| Gentoo | 滚动 | 512 MB | 5 GB | -| Windows (DD) | 任何 | 512 MB | 取决于镜像 | -| Windows (ISO) | Vista, 7, 8.x (Server 2008 ~ 2012 R2) | 512 MB | 25 GB | -| Windows (ISO) | 10, 11 (Server 2016 ~ 2025) | 1 GB | 25 GB | +| 目标系统 | 版本 | 内存 | 硬盘 | +| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ------------ | +| Alpine | 3.17, 3.18, 3.19, 3.20 | 256 MB | 1 GB | +| Debian | 9, 10, 11, 12 | 256 MB | 1 ~ 1.5 GB ^ | +| Kali | 滚动 | 256 MB | 1 ~ 1.5 GB ^ | +| Ubuntu | 20.04, 22.04, 24.04 | 512 MB \* | 2 GB | +| CentOS | 9 | 512 MB \* | 5 GB | +| Anolis | 7, 8 | 512 MB \* | 5 GB | +| RedHat   Alma   Rocky | 8, 9 | 512 MB \* | 5 GB | +| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB | +| Oracle | 7, 8, 9 | 512 MB \* | 5 GB | +| Fedora | 39, 40 | 512 MB \* | 5 GB | +| openEuler | 20.03, 22.03, 24.03 | 512 MB \* | 5 GB | +| openSUSE | 15.5, 15.6, Tumbleweed (滚动) | 512 MB \* | 5 GB | +| Arch | 滚动 | 512 MB | 5 GB | +| Gentoo | 滚动 | 512 MB | 5 GB | +| Windows (DD) | 任何 | 512 MB | 取决于镜像 | +| Windows (ISO) | Vista, 7, 8.x (Server 2008 ~ 2012 R2) | 512 MB | 25 GB | +| Windows (ISO) | 10, 11 (Server 2016 ~ 2025) | 1 GB | 25 GB | (\*) 表示使用云镜像安装,非传统网络安装 @@ -148,9 +149,9 @@ bash reinstall.sh centos 9 anolis 7|8 alma 8|9 rocky 8|9 - oracle 8|9 redhat 8|9 --img='http://xxx.qcow2' opencloudos 8|9 + oracle 7|8|9 fedora 39|40 debian 9|10|11|12 openeuler 20.03|22.03|24.03 diff --git a/reinstall.sh b/reinstall.sh index 18ed177..70c8d6c 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -35,9 +35,9 @@ Usage: $reinstall____ centos 9 anolis 7|8 alma 8|9 rocky 8|9 - oracle 8|9 redhat 8|9 --img='http://xxx.qcow2' opencloudos 8|9 + oracle 7|8|9 fedora 39|40 debian 9|10|11|12 openeuler 20.03|22.03|24.03 @@ -1248,11 +1248,11 @@ verify_os_name() { for os in \ 'centos 7|9' \ 'anolis 7|8' \ - 'oracle 8|9' \ 'alma 8|9' \ 'rocky 8|9' \ 'redhat 8|9' \ 'opencloudos 8|9' \ + 'oracle 7|8|9' \ 'fedora 39|40' \ 'debian 9|10|11|12' \ 'openeuler 20.03|22.03|24.03' \ diff --git a/trans.sh b/trans.sh index 9b1cce1..282e918 100644 --- a/trans.sh +++ b/trans.sh @@ -1651,6 +1651,7 @@ create_cloud_init_network_config() { # openeuler 20.03: cloud-init 19.4 # shellcheck disable=SC2154 if { [ "$distro" = centos ] && [ "$releasever" = 7 ]; } || + { [ "$distro" = oracle ] && [ "$releasever" = 7 ]; } || { [ "$distro" = anolis ] && [ "$releasever" = 7 ]; } || { [ "$distro" = openeuler ] && [ "$releasever" = 20.03 ]; }; then type_ipv6_static=static