From 6f2440b71049b138cce493c6f02d6fa26f1a2e27 Mon Sep 17 00:00:00 2001 From: Guofang Date: Mon, 19 Oct 2026 09:28:55 +0800 Subject: [PATCH] Drop .install from the Windows install disk image name Co-Authored-By: Claude Sonnet 5.5 --- run-windows11.py | 6 +++--- vm-images | 2 +- windows11-arm64-install-speed.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/run-windows11.py b/run-windows11.py index 6fe6529..4e530ff 100755 --- a/run-windows11.py +++ b/run-windows11.py @@ -153,7 +153,7 @@ Options: --install-from-iso Install from ISO when the system disk is missing --install-from-img Like --install-from-iso, but install from the disk image made by vm-images/build-windows-install-disk.sh, which - is the ISO path ending in .install.img instead of .iso. + is the ISO path ending in .img instead of .iso. It is attached as an NVMe disk, much faster than the emulated USB CD-ROM, and is never modified --state-dir DIR Directory for the VM disk, seed ISO and runtime files @@ -167,7 +167,7 @@ Options: Environment variables: WIN11_VM_BASE_IMAGE Windows 11 base QCOW2 image (default: beside shared images) WIN11_VM_INSTALL_ISO Windows 11 installation ISO used with --install-from-iso - (--install-from-img uses the same path ending in .install.img) + (--install-from-img uses the same path ending in .img) WIN11_VM_TOOLS_ISO VirtIO Windows tools ISO (default: resolved by shared image helper) WIN11_VM_RDP_PORT Host RDP port (default: 3389) WIN11_VM_SSH_PORT Host SSH port (default: 2222) @@ -262,7 +262,7 @@ if not disk_image.is_file(): env("WIN11_VM_INSTALL_ISO") or capture([str(image_downloader), "--print-path", "windows11", "--iso"])) if install_from_img: - install_iso = install_iso.with_suffix(".install.img") + install_iso = install_iso.with_suffix(".img") uses_shared_tools_iso = False if env("WIN11_VM_TOOLS_ISO"): tools_iso = Path(env("WIN11_VM_TOOLS_ISO")) diff --git a/vm-images b/vm-images index 2aae652..dd29fd9 160000 --- a/vm-images +++ b/vm-images @@ -1 +1 @@ -Subproject commit 2aae6525692df80ad96bfc977b8b9ea5b0c72b68 +Subproject commit dd29fd92a7150d8c6b7e9a35a3958f7e3ef57908 diff --git a/windows11-arm64-install-speed.md b/windows11-arm64-install-speed.md index ba8ffd3..b3f2137 100644 --- a/windows11-arm64-install-speed.md +++ b/windows11-arm64-install-speed.md @@ -80,7 +80,7 @@ brew install wimlib dosfstools gptfdisk mtools # 一次性 vm-images/build-windows-install-disk.sh [--force] ISO [OUTPUT.img] ``` -`OUTPUT` 默认是 ISO 路径把 `.iso` 换成 `.install.img`。脚本做的事： +`OUTPUT` 默认是 ISO 路径把 `.iso` 换成 `.img`。脚本做的事： 1. `hdiutil attach -readonly` 把 ISO 挂载到临时目录。 2. `wimlib-imagex split` 把 `install.wim` 拆成两个不超过 3800 MiB 的分卷。 @@ -101,7 +101,7 @@ vm-images/build-windows-install-disk.sh [--force] ISO [OUTPUT.img] ### 启动方式 `run-windows11.py` 的 `--install-from-img` 用这个镜像做安装介质，隐含 `--install-from-iso`。镜像路径是 ISO 路径 -（`WIN11_VM_INSTALL_ISO` 或自动查找到的 ISO）把 `.iso` 换成 `.install.img`，也就是 `build-windows-install-disk.sh ISO` 默认生成的位置， +（`WIN11_VM_INSTALL_ISO` 或自动查找到的 ISO）把 `.iso` 换成 `.img`，也就是 `build-windows-install-disk.sh ISO` 默认生成的位置， 此时不再读取 ISO： ```bash