From d3b40f33931ce0896e957594bb894f0952a30197 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Tue, 26 Nov 2024 22:09:05 +0800 Subject: [PATCH] =?UTF-8?q?core:=20alma=20=E6=9B=B4=E6=94=B9=E4=B8=BA=20al?= =?UTF-8?q?malinux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/run_reinstall.yml | 2 +- README.en.md | 44 ++++++++++++++--------------- README.md | 44 ++++++++++++++--------------- reinstall.sh | 34 +++++++++++----------- trans.sh | 18 ++++++------ 5 files changed, 71 insertions(+), 71 deletions(-) diff --git a/.github/workflows/run_reinstall.yml b/.github/workflows/run_reinstall.yml index c8958bd..38843da 100644 --- a/.github/workflows/run_reinstall.yml +++ b/.github/workflows/run_reinstall.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v4 - run: | ${{ matrix.command }} centos - ${{ matrix.command }} alma-8 + ${{ matrix.command }} almalinux 8 ${{ matrix.command }} rocky 9 ${{ matrix.command }} fedora ${{ matrix.command }} ubuntu diff --git a/README.en.md b/README.en.md index 1109b4b..59fe548 100644 --- a/README.en.md +++ b/README.en.md @@ -30,26 +30,26 @@ The original system can be any system listed in the table. The system requirements for the target system are as follows: -| 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 | 16.04, 18.04, 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 | 40, 41 | 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 | -| NixOS | 24.05 | 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 | 16.04, 18.04, 20.04, 22.04, 24.04 | 512 MB \* | 2 GB | +| CentOS | 9 | 512 MB \* | 5 GB | +| Anolis | 7, 8 | 512 MB \* | 5 GB | +| RedHat   AlmaLinux   Rocky | 8, 9 | 512 MB \* | 5 GB | +| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB | +| Oracle | 7, 8, 9 | 512 MB \* | 5 GB | +| Fedora | 40, 41 | 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 | +| NixOS | 24.05 | 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. @@ -126,7 +126,7 @@ certutil -urlcache -f -split https://www.ghproxy.cc/https://raw.githubuserconten ```bash bash reinstall.sh centos 9 anolis 7|8 - alma 8|9 + almalinux 8|9 rocky 8|9 redhat 8|9 --img='http://xxx.com/xxx.qcow2' opencloudos 8|9 @@ -168,7 +168,7 @@ Install Debian using a cloud image bash reinstall.sh debian --ci ``` -Install CentOS, Alma, Rocky, Fedora using ISO +Install CentOS, AlmaLinux, Rocky, Fedora using ISO - Only supports machines with more than 2G of memory and dynamic IP. - Password is `123@@@`, and the SSH port is `22`; modifying them using parameters is not supported. diff --git a/README.md b/README.md index 75a0611..cbb1a5d 100644 --- a/README.md +++ b/README.md @@ -30,26 +30,26 @@ 目标系统的配置要求如下： -| 目标系统 | 版本 | 内存 | 硬盘 | -| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | --------- | ------------ | -| 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 | 16.04, 18.04, 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 | 40, 41 | 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 | -| NixOS | 24.05 | 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 | 16.04, 18.04, 20.04, 22.04, 24.04 | 512 MB \* | 2 GB | +| CentOS | 9 | 512 MB \* | 5 GB | +| Anolis | 7, 8 | 512 MB \* | 5 GB | +| RedHat   AlmaLinux   Rocky | 8, 9 | 512 MB \* | 5 GB | +| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB | +| Oracle | 7, 8, 9 | 512 MB \* | 5 GB | +| Fedora | 40, 41 | 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 | +| NixOS | 24.05 | 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 | \* 表示使用云镜像安装，非传统网络安装 @@ -126,7 +126,7 @@ certutil -urlcache -f -split https://www.ghproxy.cc/https://raw.githubuserconten ```bash bash reinstall.sh centos 9 anolis 7|8 - alma 8|9 + almalinux 8|9 rocky 8|9 redhat 8|9 --img='http://xxx.com/xxx.qcow2' opencloudos 8|9 @@ -168,7 +168,7 @@ bash reinstall.sh centos 9 bash reinstall.sh debian --ci ``` -ISO 安装 CentOS, Alma, Rocky, Fedora +ISO 安装 CentOS, AlmaLinux, Rocky, Fedora - 仅支持内存大于 2G 且为动态 IP 的机器 - 密码 `123@@@`，SSH 端口 `22`，不支持用参数修改 diff --git a/reinstall.sh b/reinstall.sh index a315859..006da74 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -44,7 +44,7 @@ usage_and_exit() { cat </dev/null && ! grep -q 'initrd /boot/' /os/boot/loader/entries/*.conf; then @@ -5041,7 +5041,7 @@ trans() { create_part download_qcow case "$distro" in - centos | alma | rocky | oracle | redhat | anolis | opencloudos | openeuler) + centos | almalinux | rocky | oracle | redhat | anolis | opencloudos | openeuler) # 这几个系统云镜像系统盘是8~9g xfs，而我们的目标是能在5g硬盘上运行，因此改成复制系统文件 install_qcow_by_copy ;; @@ -5096,7 +5096,7 @@ trans() { create_part mount_part_for_iso_installer case "$distro" in - centos | alma | rocky | fedora | ubuntu | redhat) install_redhat_ubuntu ;; + centos | almalinux | rocky | fedora | ubuntu | redhat) install_redhat_ubuntu ;; windows) install_windows ;; esac ;;