diff --git a/README.en.md b/README.en.md index 7b44d91..a57ca8f 100644 --- a/README.en.md +++ b/README.en.md @@ -26,8 +26,8 @@ Reinstall server with one-click [中文](README.md) | Alpine | 3.17, 3.18, 3.19, 3.20 | 256 MB | 1 GB | | Debian | 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 | 7, 8, 9 | 512 MB \* | 5 GB | +| Ubuntu | 20.04, 22.04, 24.04 | 512 MB \* | 2 GB | +| CentOS | 7, 9 (stream) | 512 MB \* | 5 GB | | Oracle | 7, 8, 9 | 512 MB \* | 5 GB | | Alma | 8, 9 | 512 MB \* | 5 GB | | Rocky | 8, 9 | 512 MB \* | 5 GB | @@ -218,6 +218,7 @@ bash reinstall.sh windows \ - - (Need to open it with a mobile User-Agent) - + - (Preview) - - - diff --git a/README.md b/README.md index 046eecc..0c1f954 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ | Alpine | 3.17, 3.18, 3.19, 3.20 | 256 MB | 1 GB | | Debian | 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 | +| Ubuntu | 20.04, 22.04, 24.04 | 512 MB \* | 2 GB | | CentOS | 7, 9 (stream) | 512 MB \* | 5 GB | | Oracle | 7, 8, 9 | 512 MB \* | 5 GB | | Alma | 8, 9 | 512 MB \* | 5 GB | @@ -219,6 +219,7 @@ bash reinstall.sh windows \ - - (需用手机 User-Agent 打开) - + - (预览版) - - - diff --git a/windows-setup.bat b/windows-setup.bat index 80e1ef1..825a1ec 100644 --- a/windows-setup.bat +++ b/windows-setup.bat @@ -111,18 +111,11 @@ rename X:\setup.exe.disabled setup.exe rem 设置 set EnableEMS=0 set ForceOldSetup=0 -set DisableRecoveryPartition=1 if %EnableEMS% EQU 1 ( set EMS=/EMSPort:COM1 /EMSBaudRate:115200 ) -rem winre 分区会在 installer 分区前面创建 -rem 因此禁止创建 winre 分区,禁止后 winre 储存在 C 盘,依然有效 -if %DisableRecoveryPartition% EQU 1 if exist Y:\sources\reagent.* ( - set ResizeRecoveryPartition=/ResizeRecoveryPartition disable -) - rem 运行 ramdisk X:\setup.exe 的话 rem vista 会找不到安装源 rem server 23h2 会无法运行 @@ -130,6 +123,15 @@ if %ForceOldSetup% EQU 1 ( set setup=Y:\sources\setup.exe ) else ( set setup=Y:\setup.exe + rem 26100 旧版安装程序不会创建 winre 分区 + rem 26100 新版安装程序会创建 winre 分区 + rem winre 分区创建在 installer 分区前面 + rem 禁止 winre 分区后,winre 储存在 C 盘,依然有效 + for /f "tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v CurrentBuildNumber') do ( + if %%a GEQ 26100 ( + set ResizeRecoveryPartition=/ResizeRecoveryPartition Disable + ) + ) ) %setup% %ResizeRecoveryPartition% %EMS%