diff --git a/README.en.md b/README.en.md index e1c16c8..2fcaf14 100644 --- a/README.en.md +++ b/README.en.md @@ -54,13 +54,13 @@ The system requirements for the target system are as follows: | RHEL   AlmaLinux   Rocky   Oracle | 8, 9, 10 | 512 MB \* | 5 GB | | OpenCloudOS | 8, 9, Stream 23 | 512 MB \* | 5 GB | | CentOS Stream | 9, 10 | 512 MB \* | 5 GB | -| Fedora | 41, 42 | 512 MB \* | 5 GB | +| Fedora | 42, 43 | 512 MB \* | 5 GB | | openEuler | 20.03 LTS - 24.03 LTS, 25.09 | 512 MB \* | 5 GB | | openSUSE | Leap 15.6, 16.0, Tumbleweed (Rolling) | 512 MB \* | 5 GB | | NixOS | 25.05 | 512 MB | 5 GB | | Arch | Rolling | 512 MB | 5 GB | | Gentoo | Rolling | 512 MB | 5 GB | -| AOSC OS | Rolling | 512 MB | 5 GB | +| AOSC OS | Rolling | 512 MB | 5 GB | | fnOS | Beta | 512 MB | 8 GB | | Windows (DD) | Any | 512 MB | Depends on image | | Windows (ISO) | Vista, 7, 8.x (Server 2008 - 2012 R2) | 512 MB | 25 GB | @@ -145,7 +145,7 @@ certutil -urlcache -f -split https://cnb.cool/bin456789/reinstall/-/git/raw/main > > Data is priceless — please think twice before proceeding! -- The username is `root` with a default password of `123@@@`. +- Username `root`. The script prompts for a password. If left blank, a random one is generated. - When installing the latest version, the version number does not need to be specified. - Maximizes disk space usage: no boot partition (except for Fedora) and no swap partition. - Automatically selects different optimized kernels based on machine type, such as `Cloud` or `HWE` kernels. @@ -180,14 +180,17 @@ bash reinstall.sh anolis 7|8|23 - `--ssh-key KEY` Set up SSH login public key, [formatted as follows](#--ssh-key). When using public key, password is empty. - `--ssh-port PORT` Change the SSH port (for log observation during installation and for the new system) - `--web-port PORT` Change the Web port (for log observation during installation only) -- `--frpc-toml /path/to/frpc.toml` Add frpc for intranet tunneling -- `--hold 2` Prevent reboot after installation completes, allowing SSH login to modify system content; the system is mounted at `/os` (this feature is not supported on Debian/Kali). +- `--frpc-toml PATH` Add frpc for intranet tunneling. Parameter can be local filepath or HTTP URL +- `--hold 1` Reboot only into install environment, without running installer, only for SSH connect to test network connection. +- `--hold 2` Prevent reboot after installation completes, allowing SSH login to modify system content; the system is mounted at `/target` for Debian/Kali and `/os` for other distros. > [!TIP] -> When installing Debian/Kali, x86 architectures can monitor the installation progress through VNC from server provider, while ARM architectures can use the serial console. > -> When installing other systems, can monitor the progress through various methods (SSH, HTTP 80 port, VNC from server provider, serial console). ->
Even if errors occur during the installation process, you can still install to Alpine via SSH by running `/trans.sh alpine` +> Can monitor the progress through various methods (SSH, HTTP 80 port, VNC from server provider, serial console). +> +> Even if errors occur during the installation process, SSH is available for manual recovery. +> +> If the target system is not Debian/Kali, run `/trans.sh alpine` can automatically recover to Alpine Linux.
@@ -229,7 +232,7 @@ bash reinstall.sh ubuntu --installer > > Data is priceless — please think twice before proceeding! -- Supports `raw` and `vhd` image formats (either uncompressed or compressed as `.gz`, `.xz`, `.zst`, `.tar`, `.tar.gz`, `.tar.xz`, `.tar.zst`). +- Supports `raw` and fixed-size `vhd` image formats. Either uncompressed or compressed as `.gz`, `.xz`, `.zst`, `.tar`, `.tar.gz`, `.tar.xz`, `.tar.zst`. - When deploy a Windows image, the system disk will be automatically expanded, and machines with a static IP will have their IP configured, and may take a few minutes after the first boot for the configuration to take effect. - When deploy a Linux image, will **NOT** modify any contents of the image. @@ -243,17 +246,22 @@ bash reinstall.sh dd --img "https://example.com/xxx.xz" - `--rdp-port PORT` Change RDP port (DD Windows only) - `--ssh-port PORT` Change SSH port (for log observation during installation) - `--web-port PORT` Change Web port (for log observation during installation) -- `--frpc-toml /path/to/frpc.toml` Add frpc for intranet tunneling (DD Windows only) -- `--hold 2` Prevent reboot after the DD process finishes, allowing SSH login to modify system content. The Windows system will be mounted at `/os`, but Linux systems will **NOT** be automatically mounted. +- `--frpc-toml PATH` Add frpc for intranet tunneling (DD Windows only). Parameter can be local filepath or HTTP URL +- `--hold 1` Reboot only into install environment, without running installer, only for SSH connect to test network connection. +- `--hold 2` Prevent reboot after the DD process finishes. For SSH login to modify system content. The Windows system will be mounted at `/os`, but Linux systems will **NOT** be automatically mounted. > [!TIP] +> > Can monitor the progress through various methods (SSH, HTTP 80 port, VNC from server provider, serial console). ->
Even if errors occur during the installation process, you can still install to Alpine via SSH by running `/trans.sh alpine` +> +> Even if errors occur during the installation process, SSH is available for manual recovery. +> +> Or Run `/trans.sh alpine` to automatically recover to Alpine Linux. ### Feature 3: Reboot to Alpine Live OS (RAM OS) - You can use SSH to backup/restore disk, manually perform DD operations, partition modifications, manual Alpine installation, and other operations. -- Username `root`, Default password `123@@@` +- Username `root`. The script prompts for a password. If left blank, a random one is generated. > [!TIP] > @@ -262,7 +270,7 @@ bash reinstall.sh dd --img "https://example.com/xxx.xz" > If the user does not damage the original system during manual operation, rebooting will return to the original system. ```bash -bash reinstall.sh alpine --hold=1 +bash reinstall.sh alpine --hold 1 ``` #### Optional Parameters @@ -270,7 +278,7 @@ bash reinstall.sh alpine --hold=1 - `--password PASSWORD` Set password - `--ssh-port PORT` Change SSH port - `--ssh-key KEY` Set up SSH login public key, [formatted as follows](#--ssh-key). When using public key, password is empty. -- `--frpc-toml /path/to/frpc.toml` Add frpc for intranet tunneling +- `--frpc-toml PATH` Add frpc for intranet tunneling. Parameter can be local filepath or HTTP URL ### Feature 4: Reboot to netboot.xyz @@ -298,10 +306,11 @@ bash reinstall.sh netboot.xyz > > Data is priceless — please think twice before proceeding! -- Username `administrator`, Default password `123@@@` +- Username `administrator`. The script prompts for a password. If left blank, a random one is generated. - If remote login fails, try using the username `.\administrator`. - The machine with a static IP will automatically configure the IP. It may take a few minutes to take effect on the first boot. -- Supports all languages. +- Supports ISO images in any language. +- Supports bypassing Windows 11 hardware requirements. #### Supported Systems @@ -401,7 +410,6 @@ bash reinstall.sh windows \ - - - Evaluation - - - - - @@ -425,8 +433,9 @@ bash reinstall.sh windows \ - `--add-driver INF_OR_DIR` Add additional driver, specifying .inf path, or the folder contains .inf file. - The driver must be downloaded to current system first. - This parameter can be set multiple times to add different driver. -- `--frpc-toml /path/to/frpc.toml` Add frpc for intranet tunneling -- `--hold 2` Allow SSH connections for modifying the disk content before rebooting into the official Windows installation program, with the disk mounted at `/os`. +- `--frpc-toml PATH` Add frpc for intranet tunneling. Parameter can be local filepath or HTTP URL +- `--hold 1` Reboot only into install environment, without running installer, only for SSH connect to test network connection. +- `--hold 2` Allow SSH connections for modifying `boot.wim`, `install.wim` or other contents before rebooting into the official Windows installation program, with the disk mounted at `/os`. #### The following drivers will automatic download and install as needed, without the need for manual addition @@ -488,20 +497,26 @@ Open File menu > Open Image File, select the iso to be installed to get the imag > Vista (Server 2008) and 32-bit systems may lack drivers. > [!WARNING] -> For EFI machines without CSM enabled, Windows 7 (Server 2008 R2) cannot be installed. > -> Hyper-V (Azure) requires selecting the appropriate VM generation: +> For Windows 7 (Server 2008 R2) installation: +> +> 1. EFI-boot machines must enable CSM. +> +> 2. On Hyper-V (Azure), select Generation 1 VM. > [!WARNING] +> > In the Chinese version of Windows 10 LTSC 2021 ISO `zh-cn_windows_10_enterprise_ltsc_2021_x64_dvd_033b7312.iso`, the `wsappx` process may indefinitely consume CPU resources. > > The solution is to update the system patches or manually install the `VCLibs` library . > [!WARNING] +> > When installing Windows ISOs released in `May 2022` or later on GCP, the system may repeatedly reboot during the Windows installation (PE) stage. You can resolve this issue using one of the following two methods: > > 1. Add the `--force-boot-mode bios` parameter. The script will install Windows in `BIOS boot + MBR partition table` mode. ->
- (Optional) After installation, you can convert it to `EFI boot + GPT partition table` using the command `MBR2GPT /convert /allowFullOS`. +> +> (Optional) After installation, you can convert it to `EFI boot + GPT partition table` using the command `MBR2GPT /convert /allowFullOS`. > > 2. Create a custom RAW image and install it via DD. @@ -551,7 +566,7 @@ Log in to the server using Remote Desktop, open Device Manager, locate the graph According to the Law of Bug Conservation, fixing old bugs often introduces new ones. -If you encounter such a situation, you can try using an older version. +If a new bug occurs, try using an older version to see if it works. Go to and find the old version’s `commit_id` on the right side. diff --git a/README.md b/README.md index 975be82..ed64b68 100644 --- a/README.md +++ b/README.md @@ -54,13 +54,13 @@ | RHEL   AlmaLinux   Rocky   Oracle | 8, 9, 10 | 512 MB \* | 5 GB | | OpenCloudOS | 8, 9, Stream 23 | 512 MB \* | 5 GB | | CentOS Stream | 9, 10 | 512 MB \* | 5 GB | -| Fedora | 41, 42 | 512 MB \* | 5 GB | +| Fedora | 42, 43 | 512 MB \* | 5 GB | | openEuler | 20.03 LTS - 24.03 LTS, 25.09 | 512 MB \* | 5 GB | | openSUSE | Leap 15.6, 16.0, Tumbleweed (滚动) | 512 MB \* | 5 GB | | NixOS | 25.05 | 512 MB | 5 GB | | Arch | 滚动 | 512 MB | 5 GB | | Gentoo | 滚动 | 512 MB | 5 GB | -| 安同 OS | 滚动 | 512 MB | 5 GB | +| 安同 OS | 滚动 | 512 MB | 5 GB | | 飞牛 fnOS | 公测 | 512 MB | 8 GB | | Windows (DD) | 任何 | 512 MB | 取决于镜像 | | Windows (ISO) | Vista, 7, 8.x (Server 2008 - 2012 R2) | 512 MB | 25 GB | @@ -145,7 +145,7 @@ certutil -urlcache -f -split https://cnb.cool/bin456789/reinstall/-/git/raw/main > > 数据无价,请三思而后行! -- 用户名 `root` 默认密码 `123@@@` +- 用户名为 `root`,脚本会提示输入密码,不输入则使用随机密码 - 安装最新版可不输入版本号 - 最大化利用磁盘空间:不含 boot 分区(Fedora 例外),不含 swap 分区 - 自动根据机器类型选择不同的优化内核,例如 `Cloud`、`HWE` 内核 @@ -180,14 +180,17 @@ bash reinstall.sh anolis 7|8|23 - `--ssh-key KEY` 设置 SSH 登录公钥,[格式如下](#--ssh-key)。当使用公钥时,密码为空 - `--ssh-port PORT` 修改 SSH 端口(安装期间观察日志用,也作用于新系统) - `--web-port PORT` 修改 Web 端口(安装期间观察日志用) -- `--frpc-toml /path/to/frpc.toml` 添加 frpc 内网穿透 -- `--hold 2` 安装结束后不重启,此时可以 SSH 登录修改系统内容,系统挂载在 `/os` (此功能不支持 Debian/Kali) +- `--frpc-toml PATH` 添加 frpc 内网穿透,参数填本地路径或 HTTP 链接 +- `--hold 1` 仅重启到安装环境,不运行安装,用于 SSH 登录验证网络连通性 +- `--hold 2` 安装结束后不重启,用于 SSH 登录修改系统内容,Debian/Kali 会挂载在 `/target`,其它系统会挂载在 `/os` > [!TIP] -> 安装 Debian/Kali 时,x86 可通过商家后台 VNC 查看安装进度,ARM 可通过串行控制台查看安装进度。 > -> 安装其它系统时,可通过多种方式(SSH、HTTP 80 端口、商家后台 VNC、串行控制台)查看安装进度。 ->
即使安装过程出错,也能通过 SSH 运行 `/trans.sh alpine` 安装到 Alpine。 +> 可通过多种方式(SSH、HTTP 80 端口、商家后台 VNC、串行控制台)查看安装进度。 +> +> 即使安装过程出错,也能连接 SSH 手动救砖。 +> +> 目标系统非 Debian/Kali 时,可以运行 `/trans.sh alpine` 自动救砖成 Alpine 系统。
@@ -229,7 +232,7 @@ bash reinstall.sh ubuntu --installer > > 数据无价,请三思而后行! -- 支持 `raw` `vhd` 格式的镜像(未压缩,或者压缩成 `.gz` `.xz` `.zst` `.tar` `.tar.gz` `.tar.xz` `.tar.zst`) +- 支持 `raw` 和固定大小的 `vhd` 镜像。未压缩或者压缩成 `.gz` `.xz` `.zst` `.tar` `.tar.gz` `.tar.xz` `.tar.zst` - DD Windows 镜像时,会自动扩展系统盘,静态 IP 的机器会配置好 IP,可能首次开机几分钟后才生效 - DD Linux 镜像时,**不会**修改镜像的任何内容 @@ -243,17 +246,22 @@ bash reinstall.sh dd --img "https://example.com/xxx.xz" - `--rdp-port PORT` 修改 RDP 端口 (仅限 DD Windows) - `--ssh-port PORT` 修改 SSH 端口(安装期间观察日志用) - `--web-port PORT` 修改 Web 端口(安装期间观察日志用) -- `--frpc-toml /path/to/frpc.toml` 添加 frpc 内网穿透(仅限 DD Windows) -- `--hold 2` DD 结束后不重启,此时可以 SSH 登录修改系统内容,Windows 系统会挂载在 `/os`,Linux 系统**不会**自动挂载 +- `--frpc-toml PATH` 添加 frpc 内网穿透(仅限 DD Windows),参数填本地路径或 HTTP 链接 +- `--hold 1` 仅重启到安装环境,不运行安装,用于 SSH 登录验证网络连通性 +- `--hold 2` DD 结束后不重启,用于 SSH 登录修改系统内容,Windows 系统会挂载在 `/os`,Linux 系统**不会**自动挂载 > [!TIP] +> > 可通过多种方式(SSH、HTTP 80 端口、商家后台 VNC、串行控制台)查看安装进度。 ->
即使安装过程出错,也能通过 SSH 运行 `/trans.sh alpine` 安装到 Alpine。 +> +> 即使安装过程出错,也能连接 SSH 手动救砖 +> +> 也可以运行 `/trans.sh alpine` 自动救砖成 Alpine 系统。 ### 功能 3: 重启到 Alpine Live OS(内存系统) - 可用 ssh 连接,进行备份/恢复硬盘、手动 DD、修改分区、手动安装 Alpine 等操作 -- 用户名 `root` 默认密码 `123@@@` +- 用户名为 `root`,脚本会提示输入密码,不输入则使用随机密码 > [!TIP] > @@ -262,7 +270,7 @@ bash reinstall.sh dd --img "https://example.com/xxx.xz" > 如果用户手动操作没有破坏原系统,再次重启将回到原系统 ```bash -bash reinstall.sh alpine --hold=1 +bash reinstall.sh alpine --hold 1 ``` #### 可选参数 @@ -270,7 +278,7 @@ bash reinstall.sh alpine --hold=1 - `--password PASSWORD` 设置密码 - `--ssh-port PORT` 修改 SSH 端口 - `--ssh-key KEY` 设置 SSH 登录公钥,[格式如下](#--ssh-key)。当使用公钥时,密码为空 -- `--frpc-toml /path/to/frpc.toml` 添加 frpc 内网穿透 +- `--frpc-toml PATH` 添加 frpc 内网穿透,参数填本地路径或 HTTP 链接 ### 功能 4: 重启到 netboot.xyz @@ -298,10 +306,11 @@ bash reinstall.sh netboot.xyz > > 数据无价,请三思而后行! -- 用户名 `administrator` 默认密码 `123@@@` +- 用户名为 `administrator`,脚本会提示输入密码,不输入则使用随机密码 - 如果远程登录失败,可以尝试使用用户名 `.\administrator` - 静态机器会自动配置好 IP,可能首次开机几分钟后才生效 -- 支持所有语言 +- 支持任意语言的 ISO +- 支持绕过 Windows 11 硬件限制 #### 支持的系统 @@ -401,7 +410,6 @@ bash reinstall.sh windows \ - - - 评估版 - - - - - @@ -425,8 +433,9 @@ bash reinstall.sh windows \ - `--add-driver INF_OR_DIR` 添加额外驱动,填写 .inf 路径,或者 .inf 所在的文件夹 - 需先下载驱动到当前系统 - 可多次设置该参数以添加不同的驱动 -- `--frpc-toml /path/to/frpc.toml` 添加 frpc 内网穿透 -- `--hold 2` 在进入 Windows 官方安装程序之前,可以 SSH 登录修改硬盘内容,硬盘挂载在 `/os` +- `--frpc-toml PATH` 添加 frpc 内网穿透,参数填本地路径或 HTTP 链接 +- `--hold 1` 仅重启到安装环境,不运行安装,用于 SSH 登录验证网络连通性 +- `--hold 2` 用于在进入 Windows 官方安装程序之前,SSH 登录修改 `boot.wim`、`install.wim` 或者其它内容,硬盘挂载在 `/os` #### 以下驱动会自动按需下载安装,无需手动添加 @@ -488,20 +497,26 @@ Windows Server 2025 SERVERDATACENTER > Vista (Server 2008) 和 32 位系统可能会缺少驱动 > [!WARNING] -> 未开启 CSM 的 EFI 机器,无法安装 Windows 7 (Server 2008 R2) > -> Hyper-V (Azure) 需选择合适的虚拟机代系 +> 安装 Windows 7 (Server 2008 R2) 时 +> +> 1. EFI 引导的机器要开启 CSM +> +> 2. Hyper-V (Azure) 需选择第 1 代虚拟机 > [!WARNING] +> > Windows 10 LTSC 2021 中文版镜像 `zh-cn_windows_10_enterprise_ltsc_2021_x64_dvd_033b7312.iso` 的 `wsappx` 进程会长期占用 CPU > > 解决方法是更新系统补丁,或者手动安装 `VCLibs` 库 > [!WARNING] +> > 在 GCP 上安装 `2022年5月` 和之后发布的 Windows ISO,在引导 Windows 安装界面 (PE) 时会不断反复重启。解决方法如下,二选一 > > 1. 添加 `--force-boot-mode bios` 参数,脚本将以 `BIOS 引导 + MBR 分区表` 方式安装 Windows ->
- (可选) 安装完成后用 `MBR2GPT /convert /allowFullOS` 命令转为 `EFI 引导 + GPT 分区表` +> +> (可选) 安装完成后用 `MBR2GPT /convert /allowFullOS` 命令转为 `EFI 引导 + GPT 分区表` > > 2. 自制 RAW 镜像并通过 DD 安装 @@ -551,7 +566,7 @@ Windows Server 2025 SERVERDATACENTER 根据 Bug 守恒定律,修复旧 Bug 的同时会引入新的 Bug -如果遇到这种情况,可以尝试使用旧版本 +如果遇到新的 Bug,可以试下旧版本是否正常 从 右侧找到旧版本的 `commit_id` diff --git a/debian.cfg b/debian.cfg index ef6b449..d24aa63 100644 --- a/debian.cfg +++ b/debian.cfg @@ -6,10 +6,10 @@ # 需要留意 kali initrd 自带的 /preseed.cfg # 下面这行语句无效,因为本行后面有反斜杠,前面有空格(安装器认为不算注释)\ -d-i debian-installer/locale string en_US +d-i debian-installer/locale string en_US.UTF-8 # B.4.1. 本地化 -d-i debian-installer/locale string en_US +d-i debian-installer/locale string en_US.UTF-8 d-i keyboard-configuration/xkb-keymap select us # B.4.2. 网络设置 @@ -76,6 +76,7 @@ d-i partman-auto/expert_recipe_efi string efi :: \ 1 1 -1 $default_filesystem \ method{ format } format{ } use_filesystem{ } $default_filesystem{ } mountpoint{ / } . +# 大于 2T 会自动用 gpt # shellcheck disable=SC1083,SC2086,SC2154 d-i partman-auto/expert_recipe_bios string bios :: \ 1 1 1 free \ @@ -215,7 +216,6 @@ d-i preseed/early_command string true; \ fi; \ sleep 5; \ done; \ - rm -f /frpc.tar.gz; \ chmod a+x /usr/local/bin/frpc; \ cp /configs/frpc.toml /usr/local/etc/frpc/; \ run_as_service_with_screen /usr/local/bin/frpc -c /usr/local/etc/frpc/frpc.toml; \ diff --git a/frpc-example.toml b/frpc-example.toml index f549500..fbea59a 100644 --- a/frpc-example.toml +++ b/frpc-example.toml @@ -1,6 +1,6 @@ -serverAddr = "YOUR_FRP_SERVER_IP" +serverAddr = "11.22.33.44" serverPort = 7000 -auth.token = "YOUR_FRP_TOKEN" +auth.token = "123456" [[proxies]] name = "ssh" diff --git a/get-frpc-url.sh b/get-frpc-url.sh index edc4ce0..33f736b 100644 --- a/get-frpc-url.sh +++ b/get-frpc-url.sh @@ -10,7 +10,7 @@ is_in_china() { } is_ipv6_only() { - ! grep -q 1 /dev/netconf/eth*/ipv4_has_internet + ! grep -q 1 /dev/netconf/*/ipv4_has_internet } get_frpc_url() { diff --git a/initrd-network.sh b/initrd-network.sh index baba2ae..e3b21d7 100644 --- a/initrd-network.sh +++ b/initrd-network.sh @@ -240,11 +240,17 @@ test_connect() { test_internet() { for i in $(seq 5); do echo "Testing Internet Connection. Test $i... " - if is_need_test_ipv4 && { local current_ipv4_addr; current_ipv4_addr="$(get_first_ipv4_addr | remove_netmask)"; test_connect "$current_ipv4_addr" "$ipv4_dns1" >/dev/null 2>&1 || test_connect "$current_ipv4_addr" "$ipv4_dns2" >/dev/null 2>&1; }; then + if is_need_test_ipv4 && + current_ipv4_addr="$(get_first_ipv4_addr | remove_netmask)" && + { test_connect "$current_ipv4_addr" "$ipv4_dns1" || + test_connect "$current_ipv4_addr" "$ipv4_dns2"; } >/dev/null 2>&1; then echo "IPv4 has internet." ipv4_has_internet=true fi - if is_need_test_ipv6 && { local current_ipv6_addr; current_ipv6_addr="$(get_first_ipv6_addr | remove_netmask)"; test_connect "$current_ipv6_addr" "$ipv6_dns1" >/dev/null 2>&1 || test_connect "$current_ipv6_addr" "$ipv6_dns2" >/dev/null 2>&1; }; then + if is_need_test_ipv6 && + current_ipv6_addr="$(get_first_ipv6_addr | remove_netmask)" && + { test_connect "$current_ipv6_addr" "$ipv6_dns1" || + test_connect "$current_ipv6_addr" "$ipv6_dns2"; } >/dev/null 2>&1; then echo "IPv6 has internet." ipv6_has_internet=true fi diff --git a/reinstall.sh b/reinstall.sh index 1d7afc6..a937749 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -35,6 +35,11 @@ trap_err() { sed -n "$line_no"p "$THIS_SCRIPT" } +if ! { [ -n "$BASH" ] && [ -n "$BASH_VERSION" ]; }; then + echo "Please run this script with bash." >&2 + exit 1 +fi + usage_and_exit() { if is_in_windows; then reinstall_____='.\reinstall.bat' @@ -133,14 +138,25 @@ Password of the image will NOT modify. " } +show_url_in_args() { + while [ $# -gt 0 ]; do + case "$1" in + [Hh][Tt][Tt][Pp][Ss]://* | [Hh][Tt][Tt][Pp]://* | [Mm][Aa][Gg][Nn][Ee][Tt]:*) echo "$1" ;; + esac + shift + done +} + curl() { is_have_cmd curl || install_pkg curl + # 显示 url + show_url_in_args "$@" >&2 + # 添加 -f, --fail,不然 404 退出码也为0 # 32位 cygwin 已停止更新,证书可能有问题,先添加 --insecure # centos 7 curl 不支持 --retry-connrefused --retry-all-errors # 因此手动 retry - grep -o 'http[^ ]*' <<<"$@" >&2 for i in $(seq 5); do if command curl --insecure --connect-timeout 10 -f "$@"; then return @@ -1053,13 +1069,13 @@ get_windows_iso_link() { fi if [ "$basearch" = aarch64 ] && ! is_have_arm_version; then - error_and_exit "No ARM iso for this Windows Version and Edition." + error_and_exit "No ARM iso for this Windows Version or Edition." fi if [ -n "$label_msdl" ]; then - iso=$(curl -L "$page_url" | grep -ioP 'https://.*?#[0-9]+' | head -1 | grep .) + iso=$(curl -L "$page_url" | grep -ioP 'https://[^ ]+?#[0-9]+' | head -1 | grep .) else - curl -L "$page_url" | grep -ioP 'https://.*?.(iso|img)' >$tmp/win.list + curl -L "$page_url" | grep -ioP 'https://[^ ]+?.(iso|img)' >$tmp/win.list # 如果不是 ltsc ,应该先去除 ltsc 链接,否则最终链接有 ltsc 的 # 例如查找 windows 10 iot enterprise,会得到 @@ -1158,6 +1174,10 @@ setos() { [ "$releasever" -le 10 ] } + if [ "$releasever" -le 9 ] && [ "$basearch" = aarch64 ]; then + error_and_exit "Debian $releasever ELTS does not support aarch64." + fi + # 用此标记要是否 elts, 用于安装后修改 elts/etls-cn 源 # shellcheck disable=SC2034 is_debian_elts && elts=1 || elts=0 @@ -1953,8 +1973,7 @@ install_pkg() { # 因为可能装了多种包管理器 if [ -f /etc/os-release ]; then # shellcheck source=/dev/null - . /etc/os-release - for id in $ID $ID_LIKE; do + for id in $({ . /etc/os-release && echo $ID $ID_LIKE; }); do # https://github.com/chef/os_release case "$id" in fedora | centos | rhel) is_have_cmd dnf && pkg_mgr=dnf || pkg_mgr=yum ;; @@ -2796,7 +2815,8 @@ install_grub_linux_efi() { info 'download grub efi' # fedora 39 的 efi 无法识别 opensuse tumbleweed 的 xfs - efi_distro=fedora + efi_distro=opensuse + grub_efi=$(get_grub_efi_filename) # 不要用 download.opensuse.org 和 download.fedoraproject.org @@ -2811,6 +2831,7 @@ install_grub_linux_efi() { # dl.fedoraproject.org 不支持 ipv6 if [ "$efi_distro" = fedora ]; then + # fedora 43 efi 在 vultr 无法引导 debain 9/10 netboot fedora_ver=$(get_latest_distro_releasever fedora) if is_in_china; then @@ -3113,9 +3134,9 @@ mkdir_clear() { # 再次运行时,有可能 mount 了 btrfs root,因此先要 umount_all # 但目前不需要 mount ,因此用不到 - # umount_all $dir - rm -rf $dir - mkdir -p $dir + # umount_all "$dir" + rm -rf "$dir" + mkdir -p "$dir" } mod_initrd_debian_kali() { @@ -3712,6 +3733,11 @@ This script is outdated, please download reinstall.sh again. remove_useless_initrd_files fi + if [ "$hold" = 0 ]; then + info 'hold 0' + read -r -p 'Press Enter to continue...' + fi + # 重建 # 注意要用 cpio -H newc 不要用 cpio -c ,不同版本的 -c 作用不一样,很坑 # -c Use the old portable (ASCII) archive format @@ -3739,14 +3765,15 @@ remove_useless_initrd_files() { for item in *; do case "$item" in # 甲骨文 arm 用自定义镜像支持设为 mlx5 vf 网卡,且不是 azure 那样显示两个网卡 - amazon | google | mellanox | realtek) ;; + # https://debian.pkgs.org/13/debian-main-amd64/linux-image-6.12.43+deb13-cloud-amd64_6.12.43-1_amd64.deb.html + amazon | google | mellanox | realtek | pensando) ;; intel) ( cd "$item" for sub_item in *; do case "$sub_item" in # 有 e100.ko e1000文件夹 e1000e文件夹 - e100* | lib* | *vf) ;; + e100* | lib* | *vf | idpf) ;; *) rm -rf $sub_item ;; esac done @@ -3800,6 +3827,7 @@ get_unix_path() { } # 脚本入口 + if mount | grep -q 'tmpfs on / type tmpfs'; then error_and_exit "Can't run this script in Live OS." fi @@ -3866,7 +3894,7 @@ for o in ci installer debug minimal allow-ping force-cn help \ done # 整理参数 -if ! opts=$(getopt -n $0 -o "h" --long "$long_opts" -- "$@"); then +if ! opts=$(getopt -n $0 -o "h,x" --long "$long_opts" -- "$@"); then exit fi @@ -3886,7 +3914,7 @@ while true; do commit=$2 shift 2 ;; - --debug) + -x | --debug) set -x shift ;; @@ -3914,7 +3942,7 @@ while true; do shift ;; --hold | --sleep) - if ! { [ "$2" = 1 ] || [ "$2" = 2 ]; }; then + if ! { [ "$2" = 0 ] || [ "$2" = 1 ] || [ "$2" = 2 ]; }; then error_and_exit "Invalid $1 value: $2" fi hold=$2 diff --git a/trans.sh b/trans.sh index 0ea265f..8703704 100644 --- a/trans.sh +++ b/trans.sh @@ -87,11 +87,20 @@ apk() { retry 5 command apk "$@" >&2 } +show_url_in_args() { + while [ $# -gt 0 ]; do + case "$1" in + [Hh][Tt][Tt][Pp][Ss]://* | [Hh][Tt][Tt][Pp]://* | [Mm][Aa][Gg][Nn][Ee][Tt]:*) echo "$1" ;; + esac + shift + done +} + # 在没有设置 set +o pipefail 的情况下,限制下载大小: # retry 5 command wget | head -c 1048576 会触发 retry,下载 5 次 # command wget "$@" --tries=5 | head -c 1048576 不会触发 wget 自带的 retry,只下载 1 次 wget() { - echo "$@" | grep -o 'http[^ ]*' >&2 + show_url_in_args "$@" >&2 if command wget 2>&1 | grep -q BusyBox; then # busybox wget 没有重试功能 # 好像默认永不超时 @@ -194,7 +203,8 @@ download() { url=$torrent fi - # intel 禁止了 aria2 下载 + # intel 禁止了 aria2 下载驱动 + # intel 禁止了 wget 下载网页内容 # 腾讯云 virtio 驱动也禁止了 aria2 下载 # -o 设置 http 下载文件名 @@ -203,7 +213,7 @@ download() { -d "$(dirname "$path")" \ -o "$(basename "$path")" \ -O "1=$(basename "$path")" \ - -U Wget/1.25.0 + -U curl/7.54.1 # opensuse 官方镜像支持 metalink # aira2 无法重命名用 metalink 下载的文件 @@ -313,7 +323,7 @@ get_approximate_ram_size() { setup_web_if_enough_ram() { total_ram=$(get_approximate_ram_size) # 512内存才安装 - if [ $total_ram -gt 400 ]; then + if [ "$total_ram" -ge 400 ]; then # lighttpd 虽然运行占用内存少,但安装占用空间大 # setup_lighttpd # setup_nginx @@ -2282,8 +2292,8 @@ aria2c() { apk add coreutils fi - # 指定 bt 种子时没有链接,因此忽略错误 - echo "$@" | grep -oE '(http|https|magnet):[^ ]*' || true + # 显示 url + show_url_in_args "$@" >&2 # 下载 tracker # 在 sub shell 里面无法保存变量,因此写入到文件 @@ -2448,8 +2458,8 @@ create_part() { # shellcheck disable=SC2154 if [ "$distro" = windows ]; then if ! size_bytes=$(get_link_file_size "$iso"); then - # 默认值,最大的iso 23h2 假设 7g - size_bytes=$((7 * 1024 * 1024 * 1024)) + # 默认值,目前最大的 iso 小于 8g + size_bytes=$((8 * 1024 * 1024 * 1024)) fi # 按iso容量计算分区大小 @@ -4421,7 +4431,7 @@ install_qcow_by_copy() { fi # el7 yum 可能会使用 ipv6,即使没有 ipv6 网络 - if [ "$(cat /dev/netconf/eth*/ipv6_has_internet | sort -u)" = 0 ]; then + if [ "$(cat /dev/netconf/*/ipv6_has_internet | sort -u)" = 0 ]; then echo 'ip_resolve=4' >>/os/etc/yum.conf fi @@ -5827,6 +5837,7 @@ install_windows() { # 用注册表无法绕过 # https://github.com/pbatard/rufus/issues/1990 # https://learn.microsoft.com/windows/iot/iot-enterprise/Hardware/System_Requirements + # win11 旧版本安装程序(24h2之前)无法用 setup.exe /product server 跳过 cpu 核数限制,因此在xml里解除限制 if [ "$product_ver" = "11" ] && [ "$(nproc)" -le 1 ]; then wiminfo "$install_wim" "$image_index" --image-property WINDOWS/INSTALLATIONTYPE=Server fi