From 11035ffa63b7df41a614476e4dd64171fa46e3e9 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Mon, 13 Jan 2025 23:19:38 +0800 Subject: [PATCH] =?UTF-8?q?core:=20=E6=B7=BB=E5=8A=A0=E9=9D=9E=20LTS=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/run_reinstall.yml | 2 +- README.en.md | 22 ++++++++------- README.md | 22 ++++++++------- reinstall.sh | 44 ++++++++++++++++++++--------- trans.sh | 2 +- 5 files changed, 56 insertions(+), 36 deletions(-) diff --git a/.github/workflows/run_reinstall.yml b/.github/workflows/run_reinstall.yml index 38843da..143ed6e 100644 --- a/.github/workflows/run_reinstall.yml +++ b/.github/workflows/run_reinstall.yml @@ -37,7 +37,7 @@ jobs: ${{ matrix.command }} netboot.xyz ${{ matrix.command }} dd --img=https://download.opensuse.org/tumbleweed/appliances/openSUSE-MicroOS.x86_64-SelfInstall.raw.xz - ${{ matrix.command }} windows --image-name='Windows 11 Pro' + ${{ matrix.command }} windows --image-name='Windows Server blah' --iso https://aka.ms/HCIReleaseImage # 测试失败例子 # ${{ matrix.command }} wrong-os diff --git a/README.en.md b/README.en.md index bcb3b26..22ebcf8 100644 --- a/README.en.md +++ b/README.en.md @@ -36,20 +36,20 @@ The system requirements for the target system are as follows: | Alpine | 3.18, 3.19, 3.20, 3.21 | 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 | -| Anolis | 7, 8 | 512 MB \* | 5 GB | +| Ubuntu | 16.04 - 24.04, 24.10 | 512 MB \* | 2 GB | +| Anolis | 7, 8, 23 | 512 MB \* | 5 GB | | RHEL   AlmaLinux   Rocky   Oracle | 8, 9 | 512 MB \* | 5 GB | -| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB | +| OpenCloudOS | 8, 9, Stream 23 | 512 MB \* | 5 GB | | CentOS | 9, 10 | 512 MB \* | 5 GB | | Fedora | 40, 41 | 512 MB \* | 5 GB | -| openEuler | 20.03, 22.03, 24.03 | 512 MB \* | 5 GB | +| openEuler | 20.03 - 24.03, 24.09 | 512 MB \* | 5 GB | | openSUSE | 15.6, Tumbleweed (Rolling) | 512 MB \* | 5 GB | | NixOS | 24.11 | 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 | +| 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. @@ -124,20 +124,20 @@ certutil -urlcache -f -split https://jihulab.com/bin456789/reinstall/-/raw/main/ - After reinstallation, if you need to change the SSH port or switch to key-based login, make sure to also modify the files inside `/etc/ssh/sshd_config.d/`. ```bash -bash reinstall.sh anolis 7|8 +bash reinstall.sh anolis 7|8|23 + opencloudos 8|9|23 rocky 8|9 redhat 8|9 --img='http://xxx.com/xxx.qcow2' oracle 8|9 almalinux 8|9 - opencloudos 8|9 centos 9|10 fedora 40|41 nixos 24.11 debian 9|10|11|12 opensuse 15.6|tumbleweed - openeuler 20.03|22.03|24.03 alpine 3.18|3.19|3.20|3.21 - ubuntu 16.04|18.04|20.04|22.04|24.04 [--minimal] + openeuler 20.03|22.03|24.03|24.09 + ubuntu 16.04|18.04|20.04|22.04|24.04|24.10 [--minimal] kali arch gentoo @@ -330,7 +330,9 @@ bash reinstall.sh windows \ - (Recommended, iso sourced from official channels, updated monthly, includes the latest patches) - (Need to open it with a non-Windows User-Agent) - +- - (Preview) +- (Preview) - - - diff --git a/README.md b/README.md index ece077d..8884eba 100644 --- a/README.md +++ b/README.md @@ -36,20 +36,20 @@ | Alpine | 3.18, 3.19, 3.20, 3.21 | 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 | -| Anolis | 7, 8 | 512 MB \* | 5 GB | +| Ubuntu | 16.04 - 24.04, 24.10 | 512 MB \* | 2 GB | +| Anolis | 7, 8, 23 | 512 MB \* | 5 GB | | RHEL   AlmaLinux   Rocky   Oracle | 8, 9 | 512 MB \* | 5 GB | -| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB | +| OpenCloudOS | 8, 9, Stream 23 | 512 MB \* | 5 GB | | CentOS | 9, 10 | 512 MB \* | 5 GB | | Fedora | 40, 41 | 512 MB \* | 5 GB | -| openEuler | 20.03, 22.03, 24.03 | 512 MB \* | 5 GB | +| openEuler | 20.03 - 24.03, 24.09 | 512 MB \* | 5 GB | | openSUSE | 15.6, Tumbleweed (滚动) | 512 MB \* | 5 GB | | NixOS | 24.11 | 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 | +| 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 | \* 表示使用云镜像安装，非传统网络安装 @@ -124,20 +124,20 @@ certutil -urlcache -f -split https://jihulab.com/bin456789/reinstall/-/raw/main/ - 重装后如需修改 SSH 端口或者改成密钥登录，注意还要修改 `/etc/ssh/sshd_config.d/` 里面的文件 ```bash -bash reinstall.sh anolis 7|8 +bash reinstall.sh anolis 7|8|23 + opencloudos 8|9|23 rocky 8|9 redhat 8|9 --img='http://xxx.com/xxx.qcow2' oracle 8|9 almalinux 8|9 - opencloudos 8|9 centos 9|10 fedora 40|41 nixos 24.11 debian 9|10|11|12 opensuse 15.6|tumbleweed - openeuler 20.03|22.03|24.03 alpine 3.18|3.19|3.20|3.21 - ubuntu 16.04|18.04|20.04|22.04|24.04 [--minimal] + openeuler 20.03|22.03|24.03|24.09 + ubuntu 16.04|18.04|20.04|22.04|24.04|24.10 [--minimal] kali arch gentoo @@ -330,7 +330,9 @@ bash reinstall.sh windows \ - (推荐，iso 来自官方，每月更新，包含最新补丁) - (需用非 Windows User-Agent 打开) - +- - (预览版) +- (预览版) - - - diff --git a/reinstall.sh b/reinstall.sh index 8964a97..5a0818d 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -44,20 +44,20 @@ usage_and_exit() { reinstall_____=' ./reinstall.sh' fi cat <&1 | grep -m1 '^ Date:') # gnu date 不支持 -D