feat: Improved installation (#486)

.github/ISSUE_TEMPLATE/QUESTION.yml

@@ -3,10 +3,20 @@ description: General questions about the container
 title: "[Question]: "
 labels: ["question"]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        Please do not use this form for technical issues, and make sure to check the [FAQ](https://github.com/dockur/windows/blob/master/readme.md) first!
+      label: Is your question not already answered in the FAQ?
+      description: Please read the [FAQ](https://github.com/dockur/windows/blob/master/readme.md) carefully to avoid asking duplicate questions.
+      options:
+      - label: I made sure the question is not listed in the [FAQ](https://github.com/dockur/windows/blob/master/readme.md).
+        required: true
+  - type: checkboxes
+    attributes:
+      label: Is this a general question and not a technical issue?
+      description: For technical issues you must use the [bug report](https://github.com/dockur/windows/issues/new?assignees=&labels=bug&projects=&template=BUG_REPORT.yml&title=%5BBug%5D%3A+) form instead. It contains all the right fields (system info, logfiles, etc.) we need in order to be able to help you.
+      options:
+      - label: I am sure my question is not about a technical issue.
+        required: true
   - type: textarea
     id: question
     attributes:

Dockerfile

@@ -1,5 +1,5 @@
 FROM scratch
-COPY --from=qemux/qemu-docker:5.02 / /
+COPY --from=qemux/qemu-docker:5.03 / /
 
 ARG DEBCONF_NOWARNINGS "yes"
 ARG DEBIAN_FRONTEND "noninteractive"

readme.md

@@ -138,21 +138,21 @@ docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --cap-add NET_
 
 * ### How do I install a custom image?
 
-  In order to download any ISO image that is not part of the list above, start a fresh container with the URL of that ISO specified in the `VERSION` environment variable, for example:
+  In order to download an unsupported ISO image that is not selectable from the list above, specify the URL of that ISO in the `VERSION` environment variable, for example:
   
   ```yaml
   environment:
     VERSION: "https://example.com/win.iso"
   ```
 
-  Alternatively, you can also use a local file directly, and skip the download altogether, by binding it in your compose file in this way:
+  Alternatively, you can also skip the download and use a local file instead, by binding it in your compose file in this way:
   
   ```yaml
   volumes:
     - /home/user/example.iso:/custom.iso
   ```
 
-  Replace the example path `/home/user/example.iso` with the filename of your desired ISO file. The value of `VERSION` will be ignored in this case.
+  Replace the example path `/home/user/example.iso` with the filename of your desired ISO file, the value of `VERSION` will be ignored in this case.
 
 * ### How do I customize the installation?
 
@@ -180,9 +180,9 @@ docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --cap-add NET_
 
 * ### How do I perform a manual installation?
 
-  It's best to use the automatic installation, as it optimizes various settings for use with this container. These tweaks will give you maximum performance and prevent common issues.
+  It's best to use the automatic installation, as it optimizes various settings to give you maximum performance and prevent common issues.
 
-  However, if you insist on performing the installation manually, start a fresh container with the following environment variable:
+  However, if you insist on performing the installation manually, add the following environment variable to your compose file:
 
   ```yaml
   environment:
@@ -193,17 +193,25 @@ docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --cap-add NET_
 
   - Start the container and connect to [port 8006](http://localhost:8006) of the container in your web browser. After the download is finished, you will see the Windows installation screen.
 
-  - Start the installation by clicking `Install now`. On the next screen, press 'OK' when prompted to `Load driver` and select the `VirtIO SCSI` driver from the list that matches your Windows version. So for Windows 11, select `D:\amd64\w11\vioscsi.inf` and click 'Next'.
+  - Start the installation by clicking `Install now`. On the next screen, press 'OK' when prompted to `Load driver`.
+
+  -  Select the `VirtIO SCSI` driver from the list that matches your Windows version. So for Windows 11, select `D:\amd64\w11\vioscsi.inf` and click 'Next'.
 
   - Accept the license agreement and select your preferred Windows edition, like Home or Pro.
 
-  - Choose `Custom: Install Windows only (advanced)`, and click `Load driver` on the next screen. Select 'Browse' and navigate to the `D:\NetKVM\w11\amd64` folder, and click 'OK'. Select the `VirtIO Ethernet Adapter` from the list and click 'Next'.
+  - Choose `Custom: Install Windows only (advanced)`, and click `Load driver` on the next screen.
+
+  - Select 'Browse' and navigate to the `D:\NetKVM\w11\amd64` folder, and click 'OK'.
+
+  - Select the `VirtIO Ethernet Adapter` from the list and click 'Next'.
 
   - Select `Drive 0` and click 'Next'.
 
   - Wait until Windows finishes copying files and completes the installation.
 
-  - Once you see the desktop, open File Explorer and navigate to the CD-ROM drive (E:). Double-click on `virtio-win-gt-x64.msi` and proceed to install the VirtIO drivers.
+  - Once you see the desktop, open File Explorer and navigate to the CD-ROM drive (`E:\`).
+
+  - Double-click on `virtio-win-gt-x64.msi` and proceed to install the VirtIO drivers.
 
   Enjoy your brand new machine, and don't forget to star this repo!
  
@@ -291,6 +299,19 @@ docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --cap-add NET_
 
   Please note that in this mode, the container and Windows will each have their own separate IPs. The container will keep the macvlan IP, and Windows will use the DHCP IP.
 
+* ### How do I add multiple disks?
+
+  To create additional disks, modify your compose file like this:
+  
+  ```yaml
+  environment:
+    DISK2_SIZE: "32G"
+    DISK3_SIZE: "64G"
+  volumes:
+    - /home/example:/storage2
+    - /mnt/data/example:/storage3
+  ```
+
 * ### How do I pass-through a disk?
 
   It is possible to pass-through disk devices directly by adding them to your compose file in this way:

src/define.sh

@@ -6,9 +6,9 @@ set -Eeuo pipefail
 : "${REMOVE:=""}"
 : "${VERSION:=""}"
 : "${DETECTED:=""}"
-: "${PLATFORM:="x64"}"
 
 MIRRORS=5
+PLATFORM="x64"
 
 parseVersion() {
 
@@ -41,23 +41,23 @@ parseVersion() {
       ;;
     "7" | "7e" | "win7" | "win7e" | "windows7" | "windows 7" )
       VERSION="win7${PLATFORM,,}"
-      DETECTED="win7${PLATFORM,,}-enterprise"
+      [ -z "$DETECTED" ] && DETECTED="win7${PLATFORM,,}-enterprise"
       ;;
     "7u" | "win7u" | "windows7u" | "windows 7u" )
       VERSION="win7${PLATFORM,,}-ultimate"
       ;;
     "vista" | "winvista" | "windowsvista" | "windows vista" )
       VERSION="winvista${PLATFORM,,}"
-      DETECTED="winvista${PLATFORM,,}-enterprise"
+      [ -z "$DETECTED" ] && DETECTED="winvista${PLATFORM,,}-enterprise"
       ;;
-    "vistau" | "winvistau" | "windowsvistau" | "windows vistau" )
+    "vistu" | "winvistu" | "windowsvistu" | "windows vistu" )
       VERSION="winvista${PLATFORM,,}-ultimate"
       ;;
-    "xp" | "xp32" | "winxp" | "windowsxp" | "windows xp" )
+    "xp" | "xp32" | "xpx86" | "winxp" | "winxp86" | "windowsxp" | "windows xp" )
       VERSION="winxpx86"
       ;;
-    "xp64" | "winxp64" | "windowsxp64" | "windows xp 64" )
-      VERSION="winxpx64"
+    "xp64" | "xpx64" | "winxp64" | "winxpx64" | "windowsxp64" | "windowsxpx64" )
+      VERSION="winxp${PLATFORM,,}"
       ;;
     "22" | "2022" | "win22" | "win2022" | "windows2022" | "windows 2022" )
       VERSION="win2022-eval"
@@ -76,27 +76,27 @@ parseVersion() {
       ;;
     "core11" | "core 11" )
       VERSION="core11"
-      DETECTED="win11${PLATFORM,,}"
+      [ -z "$DETECTED" ] && DETECTED="win11${PLATFORM,,}"
       ;;
     "tiny11" | "tiny 11" )
       VERSION="tiny11"
-      DETECTED="win11${PLATFORM,,}"
+      [ -z "$DETECTED" ] && DETECTED="win11${PLATFORM,,}"
       ;;
    "tiny10" | "tiny 10" )
       VERSION="tiny10"
-      DETECTED="win10${PLATFORM,,}-ltsc"
+      [ -z "$DETECTED" ] && DETECTED="win10${PLATFORM,,}-ltsc"
       ;;
     "iot11" | "11iot" | "win11-iot" | "win11${PLATFORM,,}-iot" | "win11${PLATFORM,,}-enterprise-iot-eval" )
-      DETECTED="win11${PLATFORM,,}-iot"
       VERSION="win11${PLATFORM,,}-enterprise-iot-eval"
+      [ -z "$DETECTED" ] && DETECTED="win11${PLATFORM,,}-iot"
       ;;
     "iot10" | "10iot" | "win10-iot" | "win10${PLATFORM,,}-iot" | "win10${PLATFORM,,}-enterprise-iot-eval" )
-      DETECTED="win10${PLATFORM,,}-iot"
       VERSION="win10${PLATFORM,,}-enterprise-iot-eval"
+      [ -z "$DETECTED" ] && DETECTED="win10${PLATFORM,,}-iot"
       ;;
     "ltsc10" | "10ltsc" | "win10-ltsc" | "win10${PLATFORM,,}-ltsc" | "win10${PLATFORM,,}-enterprise-ltsc-eval" )
-      DETECTED="win10${PLATFORM,,}-ltsc"
       VERSION="win10${PLATFORM,,}-enterprise-ltsc-eval"
+      [ -z "$DETECTED" ] && DETECTED="win10${PLATFORM,,}-ltsc"
       ;;
   esac
 
@@ -146,75 +146,39 @@ printEdition() {
   [[ "$result" == "x" ]] && echo "$desc" && return 0
 
   case "${id,,}" in
-    "win7${PLATFORM,,}-home"* )
+    *"-iot" )
+      edition="IoT"
+      ;;
+    *"-ltsc" )
+      edition="LTSC"
+      ;;
+    *"-home" )
       edition="Home"
       ;;
-    "win7${PLATFORM,,}-starter"* )
+    *"-starter" )
       edition="Starter"
       ;;
-    "win7${PLATFORM,,}-ultimate"* )
+    *"-ultimate" )
       edition="Ultimate"
       ;;
-    "win7${PLATFORM,,}-enterprise"* )
+    *"-enterprise" )
       edition="Enterprise"
       ;;
+    *"-education" )
+      edition="Education"
+      ;;
+    *"-enterprise-eval" )
+      edition="Enterprise (Evaluation)"
+      ;;
     "win7"* )
       edition="Professional"
       ;;
-    "win8${PLATFORM,,}-enterprise"* )
-      edition="Enterprise"
-      ;;
-    "win8"* )
-      edition="Pro"
-      ;;
-    "win10${PLATFORM,,}-iot"* )
-      edition="IoT"
-      ;;
-    "win10${PLATFORM,,}-ltsc"* )
-      edition="LTSC"
-      ;;
-    "win10${PLATFORM,,}-home"* )
-      edition="Home"
-      ;;
-    "win10${PLATFORM,,}-education"* )
-      edition="Education"
-      ;;
-    "win10${PLATFORM,,}-enterprise"* )
-      edition="Enterprise"
-      ;;
-    "win10"* )
-      edition="Pro"
-      ;;
-    "win11${PLATFORM,,}-iot"* )
-      edition="IoT"
-      ;;
-    "win11${PLATFORM,,}-home"* )
-      edition="Home"
-      ;;
-    "win11${PLATFORM,,}-education"* )
-      edition="Education"
-      ;;
-    "win11${PLATFORM,,}-enterprise"* )
-      edition="Enterprise"
-      ;;
-    "win11"* )
+    "win8"* | "win10"* | "win11"* )
       edition="Pro"
       ;;
     "winxp"* )
       edition="Professional"
       ;;
-    "winvista${PLATFORM,,}-home"* )
-      edition="Home"
-      ;;
-    "winvista${PLATFORM,,}-starter"* )
-      edition="Starter"
-      ;;
-    "winvista${PLATFORM,,}-ultimate"* )
-      edition="Ultimate"
-      ;;
-    "winvista${PLATFORM,,}-enterprise"* )
-      edition="Enterprise"
-      ;;
     "winvista"* )
       edition="Business"
       ;;
@@ -223,7 +187,6 @@ printEdition() {
       ;;
   esac
 
-  [[ "${id,,}" == *"-eval" ]] && edition="$edition (Evaluation)"
   [ -n "$edition" ] && result="$result $edition"
 
   echo "$result"
@@ -235,25 +198,38 @@ fromFile() {
   local id=""
   local desc="$1"
   local file="${1,,}"
+  local arch="${PLATFORM,,}"
+
+  case "${file/ /_}" in
+    *"_x64_"* | *"_x64."*)
+      arch="x64"
+      ;;
+    *"_x86_"* | *"_x86."*)
+      arch="x86"
+      ;;
+    *"_arm64_"* | *"_arm64."*)
+      arch="arm64"
+      ;;
+  esac
 
   case "${file/ /_}" in
     "win7"* | "win_7"* | *"windows7"* | *"windows_7"* )
-      id="win7${PLATFORM,,}"
+      id="win7${arch}"
       ;;
     "win8"* | "win_8"* | *"windows8"* | *"windows_8"* )
-      id="win81${PLATFORM,,}"
+      id="win81${arch}"
       ;;
     "win10"*| "win_10"* | *"windows10"* | *"windows_10"* )
-      id="win10${PLATFORM,,}"
+      id="win10${arch}"
       ;;
     "win11"* | "win_11"* | *"windows11"* | *"windows_11"* )
-      id="win11${PLATFORM,,}"
+      id="win11${arch}"
       ;;
     *"winxp"* | *"win_xp"* | *"windowsxp"* | *"windows_xp"* )
       id="winxpx86"
       ;;
     *"winvista"* | *"win_vista"* | *"windowsvista"* | *"windows_vista"* )
-      id="winvista${PLATFORM,,}"
+      id="winvista${arch}"
       ;;
     "tiny11core"* | "tiny11_core"* | "tiny_11_core"* )
       id="core11"
@@ -296,6 +272,7 @@ fromName() {
 
   local id=""
   local name="$1"
+  local arch="$2"
 
   case "${name,,}" in
     *"server 2025"* ) id="win2025" ;;
@@ -304,11 +281,11 @@ fromName() {
     *"server 2016"* ) id="win2016" ;;
     *"server 2012"* ) id="win2012r2" ;;
     *"server 2008"* ) id="win2008r2" ;;
-    *"windows 7"* ) id="win7${PLATFORM,,}" ;;
-    *"windows 8"* ) id="win81${PLATFORM,,}" ;;
-    *"windows 10"* ) id="win10${PLATFORM,,}" ;;
-    *"windows 11"* ) id="win11${PLATFORM,,}" ;;
-    *"windows vista"* ) id="winvista${PLATFORM,,}" ;;
+    *"windows 7"* ) id="win7${arch}" ;;
+    *"windows 8"* ) id="win81${arch}" ;;
+    *"windows 10"* ) id="win10${arch}" ;;
+    *"windows 11"* ) id="win11${arch}" ;;
+    *"windows vista"* ) id="winvista${arch}" ;;
   esac
 
   echo "$id"
@@ -319,8 +296,9 @@ getVersion() {
 
   local id
   local name="$1"
+  local arch="$2"
 
-  id=$(fromName "$name")
+  id=$(fromName "$name" "$arch")
 
   case "${id,,}" in
     "win7"* | "winvista"* )
@@ -571,11 +549,26 @@ getLink1() {
       sum="0b738b55a5ea388ad016535a5c8234daf2e5715a0638488ddd8a228a836055a1"
       url="$host/7/en_windows_7_with_sp1_${PLATFORM,,}.iso"
       ;;
+    "win7x86" | "win7x86-enterprise" )
+      size=2434502656
+      sum="8bdd46ff8cb8b8de9c4aba02706629c8983c45e87da110e64e13be17c8434dad"
+      url="$host/7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso"
+      ;;
+    "win7x86-ultimate" )
+      size=2564411392
+      sum="99f3369c90160816be07093dbb0ac053e0a84e52d6ed1395c92ae208ccdf67e5"
+      url="$host/7/en_windows_7_with_sp1_x86.iso"
+      ;;
     "winvista${PLATFORM,,}-ultimate" )
       size=3861460992
       sum="edf9f947c5791469fd7d2d40a5dcce663efa754f91847aa1d28ed7f585675b78"
       url="$host/vista/en_windows_vista_sp2_${PLATFORM,,}_dvd_342267.iso"
       ;;
+    "winvistax86-ultimate" )
+      size=3243413504
+      sum="9c36fed4255bd05a8506b2da88f9aad73643395e155e609398aacd2b5276289c"
+      url="$host/vista/en_windows_vista_with_sp2_x86_dvd_342266.iso"
+      ;;
     "winxpx86" )
       size=617756672
       sum="62b6c91563bad6cd12a352aa018627c314cfc5162d8e9f8af0756a642e602a46"
@@ -637,6 +630,16 @@ getLink2() {
       sum="36f4fa2416d0982697ab106e3a72d2e120dbcdb6cc54fd3906d06120d0653808"
       url="$host/Windows%207/en_windows_7_ultimate_with_sp1_${PLATFORM,,}_dvd_u_677332.iso"
       ;;
+    "win7x86" | "win7x86enterprise" )
+      size=2434502656
+      sum="8bdd46ff8cb8b8de9c4aba02706629c8983c45e87da110e64e13be17c8434dad"
+      url="$host/Windows%207/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso"
+      ;;
+    "win7x86-ultimate" )
+      size=2564476928
+      sum="e2c009a66d63a742941f5087acae1aa438dcbe87010bddd53884b1af6b22c940"
+      url="$host/Windows%207/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso"
+      ;;
     "winvista${PLATFORM,,}" | "winvista${PLATFORM,,}-enterprise" )
       size=3205953536
       sum="0a0cd511b3eac95c6f081419c9c65b12317b9d6a8d9707f89d646c910e788016"
@@ -647,6 +650,16 @@ getLink2() {
       sum="edf9f947c5791469fd7d2d40a5dcce663efa754f91847aa1d28ed7f585675b78"
       url="$host/Windows%20Vista/en_windows_vista_sp2_${PLATFORM,,}_dvd_342267.iso"
       ;;
+    "winvistax86" | "winvistax86-enterprise" )
+      size=2420981760
+      sum="54e2720004041e7db988a391543ea5228b0affc28efcf9303d2d0ff9402067f5"
+      url="$host/Windows%20Vista/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso"
+      ;;
+    "winvistax86-ultimate" )
+      size=3243413504
+      sum="9c36fed4255bd05a8506b2da88f9aad73643395e155e609398aacd2b5276289c"
+      url="$host/Windows%20Vista/en_windows_vista_with_sp2_x86_dvd_342266.iso"
+      ;;
     "winxpx86" )
       size=617756672
       sum="62b6c91563bad6cd12a352aa018627c314cfc5162d8e9f8af0756a642e602a46"
@@ -791,6 +804,16 @@ getLink4() {
       sum="36f4fa2416d0982697ab106e3a72d2e120dbcdb6cc54fd3906d06120d0653808"
       url="$host/en_windows_7_ultimate_with_sp1_${PLATFORM,,}_dvd_u_677332.iso"
       ;;
+    "win7x86" | "win7x86enterprise" )
+      size=2434502656
+      sum="8bdd46ff8cb8b8de9c4aba02706629c8983c45e87da110e64e13be17c8434dad"
+      url="$host/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso"
+      ;;
+    "win7x86-ultimate" )
+      size=2564476928
+      sum="e2c009a66d63a742941f5087acae1aa438dcbe87010bddd53884b1af6b22c940"
+      url="$host/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso"
+      ;;
     "winvista${PLATFORM,,}" | "winvista${PLATFORM,,}-enterprise" )
       size=3205953536
       sum="0a0cd511b3eac95c6f081419c9c65b12317b9d6a8d9707f89d646c910e788016"
@@ -801,6 +824,16 @@ getLink4() {
       sum="edf9f947c5791469fd7d2d40a5dcce663efa754f91847aa1d28ed7f585675b78"
       url="$host/en_windows_vista_sp2_${PLATFORM,,}_dvd_342267.iso"
       ;;
+    "winvistax86" | "winvistax86-enterprise" )
+      size=2420981760
+      sum="54e2720004041e7db988a391543ea5228b0affc28efcf9303d2d0ff9402067f5"
+      url="$host/en_windows_vista_enterprise_sp2_x86_dvd_342329.iso"
+      ;;
+    "winvistax86-ultimate" )
+      size=3243413504
+      sum="9c36fed4255bd05a8506b2da88f9aad73643395e155e609398aacd2b5276289c"
+      url="$host/en_windows_vista_with_sp2_x86_dvd_342266.iso"
+      ;;
   esac
 
   case "${ret,,}" in
@@ -951,7 +984,7 @@ migrateFiles() {
   [[ "${version,,}" == "win7${PLATFORM,,}" ]] && file="en_windows_7_enterprise_with_sp1_${PLATFORM,,}_dvd_u_677651.iso"
 
   [ ! -f "$STORAGE/$file" ] && return 0
-  ! mv "$STORAGE/$file" "$base" && return 1
+  ! mv -f "$STORAGE/$file" "$base" && return 1
 
   return 0
 }
@@ -1166,15 +1199,17 @@ prepareLegacy() {
 
   local iso="$1"
   local dir="$2"
+  local file="$dir/boot.img"
 
-  ETFS="boot.img"
-  rm -f "$dir/$ETFS"
+  ETFS=$(basename "$file")
+  [ -f "$file" ] && [ -s "$file" ] && return 0
+  rm -f "$file"
 
   local len offset
   len=$(isoinfo -d -i "$iso" | grep "Nsect " | grep -o "[^ ]*$")
   offset=$(isoinfo -d -i "$iso" | grep "Bootoff " | grep -o "[^ ]*$")
 
-  dd "if=$iso" "of=$dir/$ETFS" bs=2048 "count=$len" "skip=$offset" status=none && return 0
+  dd "if=$iso" "of=$file" bs=2048 "count=$len" "skip=$offset" status=none && return 0
 
   return 1
 }

src/install.sh

@@ -12,34 +12,58 @@ hasDisk() {
   [ -b "/disk1" ] && return 0
   [ -b "/dev/disk1" ] && return 0
   [ -b "${DEVICE:-}" ] && return 0
-
-  if [ -s "$STORAGE/data.img" ] || [ -s "$STORAGE/data.qcow2" ]; then
-    return 0
-  fi
+  [ -s "$STORAGE/data.img" ]  && return 0
+  [ -s "$STORAGE/data.qcow2" ] && return 0
 
   return 1
 }
 
 skipInstall() {
 
-  if hasDisk && [ -f "$STORAGE/windows.boot" ]; then
-    return 0
+  local iso="$1"
+  local magic byte
+  local boot="$STORAGE/windows.boot"
+  local previous="$STORAGE/windows.base"
+
+  if [ -f "$previous" ]; then
+    previous=$(<"$previous")
+    if [ -n "$previous" ]; then
+      previous="$STORAGE/$previous"
+      if [[ "${previous,,}" != "${iso,,}" ]]; then
+        if [ -f "$boot" ] && hasDisk; then
+          info "Detected that the version was changed, but ignoring this because Windows is already installed."
+          info "Please start with an empty /storage folder, if you want to install a different version of Windows."
+          return 0
+        fi
+        [ -f "$previous" ] && rm -f "$previous"
+        return 1
+      fi
+    fi
   fi
 
-  return 1
+  [ -f "$boot" ] && hasDisk && return 0
+
+  [ ! -f "$iso" ] && return 1
+  [ ! -s "$iso" ] && return 1
+
+  # Check if the ISO was already processed by our script
+  magic=$(dd if="$iso" seek=0 bs=1 count=1 status=none | tr -d '\000')
+  magic="$(printf '%s' "$magic" | od -A n -t x1 -v | tr -d ' \n')"
+  byte="16" && [[ "$MANUAL" == [Yy1]* ]] && byte="17"
+
+  if [[ "$magic" != "$byte" ]]; then
+    info "The ISO will be processed again because the configuration was changed..."
+    return 1
+  fi
+
+  return 0
 }
 
 startInstall() {
 
-  html "Starting Windows..."
+  html "Starting $APP..."
 
-  [ -z "$MANUAL" ] && MANUAL="N"
-
-  if [ -n "$CUSTOM" ]; then
-
-    ISO="$CUSTOM"
-
-  else
+  if [ -z "$CUSTOM" ]; then
 
     local file="${VERSION/\//}.iso"
 
@@ -51,47 +75,29 @@ startInstall() {
 
     fi
 
-    ISO="$STORAGE/$file"
+    BOOT="$STORAGE/$file"
 
-    ! migrateFiles "$ISO" "$VERSION" && error "Migration failed!" && exit 57
+    ! migrateFiles "$BOOT" "$VERSION" && error "Migration failed!" && exit 57
 
   fi
 
-  skipInstall && return 1
+  skipInstall "$BOOT" && return 1
 
-  if [ -f "$ISO" ] && [ -s "$ISO" ]; then
-
-    # Check if the ISO was already processed by our script
-    local magic=""
-    magic=$(dd if="$ISO" seek=0 bs=1 count=1 status=none | tr -d '\000')
-    magic="$(printf '%s' "$magic" | od -A n -t x1 -v | tr -d ' \n')"
-    [[ "$magic" == "16" ]] && return 1
-
-  fi
+  rm -rf "$TMP"
+  mkdir -p "$TMP"
 
   if [ -z "$CUSTOM" ]; then
 
-    BOOT="$ISO"
-    ISO=$(basename "$ISO")
+    ISO=$(basename "$BOOT")
     ISO="$TMP/$ISO"
 
-  else
-
-    if [ -n "$ORIGINAL" ]; then
-      rm -f "$ISO"
-      ISO="$ORIGINAL"
-      CUSTOM="$ISO"
+    if [ -f "$BOOT" ] && [ -s "$BOOT" ]; then
+      mv -f "$BOOT" "$ISO"
     fi
 
-    local size
-    size="$(stat -c%s "$ISO")"
-    BOOT="$STORAGE/windows.$size.iso"
-
   fi
 
   rm -f "$BOOT"
-  rm -rf "$TMP"
-  mkdir -p "$TMP"
   return 0
 }
 
@@ -99,23 +105,33 @@ finishInstall() {
 
   local iso="$1"
   local aborted="$2"
+  local base byte
 
   if [ ! -s "$iso" ] || [ ! -f "$iso" ]; then
     error "Failed to find ISO file: $iso" && return 1
   fi
 
-  if [ -w "$iso" ] && [[ "$aborted" != [Yy1]* ]]; then
+  if [[ "$aborted" != [Yy1]* ]]; then
     # Mark ISO as prepared via magic byte
-    if ! printf '\x16' | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then
-      error "Failed to set magic byte in ISO file: $iso" && return 1
+    byte="16" && [[ "$MANUAL" == [Yy1]* ]] && byte="17"
+    if ! printf '%b' "\x$byte" | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then
+      warn "failed to set magic byte in ISO file: $iso"
     fi
   fi
 
   rm -f "$STORAGE/windows.old"
+  rm -f "$STORAGE/windows.base"
   rm -f "$STORAGE/windows.boot"
   rm -f "$STORAGE/windows.mode"
 
-  cp /run/version "$STORAGE/windows.ver"
+  cp -f /run/version "$STORAGE/windows.ver"
+
+  if [[ "$iso" == "$STORAGE/"* ]]; then
+    if [[ "$aborted" != [Yy1]* ]] || [ -z "$CUSTOM" ]; then
+      base=$(basename "$iso")
+      echo "$base" > "$STORAGE/windows.base"
+    fi
+  fi
 
   if [[ "${PLATFORM,,}" == "x64" ]]; then
     if [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then
@@ -165,38 +181,30 @@ detectCustom() {
   local size base
 
   CUSTOM=""
-  ORIGINAL=""
 
   if [[ "${VERSION,,}" != "http"* ]]; then
     base="${VERSION/\/storage\//}"
     [[ "$base" == "."* ]] && base="${file:1}"
     [[ "$base" == *"/"* ]] && base=""
-    [ -n "$base" ] && file=$(find "$STORAGE" -maxdepth 1 -type f -iname "$base" -printf "%f\n" | head -n 1)
+    [ -n "$base" ] && file=$(find "$STORAGE" -maxdepth 1 -type f -iname "$base" | head -n 1)
   fi
 
-  [ -z "$file" ] && file=$(find "$STORAGE" -maxdepth 1 -type f -iname custom.iso -printf "%f\n" | head -n 1)
-  [ -z "$file" ] && file=$(find "$STORAGE" -maxdepth 1 -type f -iname custom.img -printf "%f\n" | head -n 1)
-  [ -n "$file" ] && file="$STORAGE/$file"
+  [ -z "$file" ] && file=$(find "$STORAGE" -maxdepth 1 -type f -iname custom.iso | head -n 1)
+  [ -z "$file" ] && file=$(find "$STORAGE" -maxdepth 1 -type f -iname custom.img | head -n 1)
 
   base="/custom.iso"
   [ -f "$base" ] && [ -s "$base" ] && file="$base"
 
-  [ -z "$file" ] && return 0
-  [ ! -f "$file" ] && return 0
-  [ ! -s "$file" ] && return 0
+  if [ ! -f "$file" ] || [ ! -s "$file" ]; then
+    return 0
+  fi
 
   size="$(stat -c%s "$file")"
   [ -z "$size" ] || [[ "$size" == "0" ]] && return 0
 
-  base="$STORAGE/windows.$size.iso"
-
-  if [ -f "$base" ] && [ -s "$base" ]; then
-    CUSTOM="$base"
-    ORIGINAL="$file"
-  else
-    CUSTOM="$file"
-    rm -f "$base"
-  fi
+  ISO="$file"
+  CUSTOM="$ISO"
+  BOOT="$STORAGE/windows.$size.iso"
 
   return 0
 }
@@ -279,7 +287,7 @@ verifyFile() {
   local check="$4"
 
   if [ -n "$size" ] && [[ "$total" != "$size" ]] && [[ "$size" != "0" ]]; then
-    warn "The downloaded file has an invalid size: $total bytes, while expected value was: $size bytes. Please report this at $SUPPORT/issues"
+    warn "The downloaded file has an unexpected size: $total bytes, while expected value was: $size bytes. Please report this at $SUPPORT/issues"
   fi
 
   local hash=""
@@ -431,10 +439,9 @@ downloadImage() {
     tried="y"
 
     if getESD "$TMP/esd" "$version"; then
-      local prev="$ISO"
       ISO="${ISO%.*}.esd"
       downloadFile "$ISO" "$ESD" "$ESD_SUM" "$ESD_SIZE" "$desc" && return 0
-      ISO="$prev"
+      ISO="$iso"
     fi
 
   fi
@@ -497,20 +504,20 @@ extractESD() {
   fi
 
   local esdImageCount
-  esdImageCount=$(wimlib-imagex info "${iso}" | awk '/Image Count:/ {print $3}')
+  esdImageCount=$(wimlib-imagex info "$iso" | awk '/Image Count:/ {print $3}')
 
-  wimlib-imagex apply "$iso" 1 "${dir}" --quiet 2>/dev/null || {
+  wimlib-imagex apply "$iso" 1 "$dir" --quiet 2>/dev/null || {
     retVal=$?
     error "Extracting $desc bootdisk failed" && return $retVal
   }
 
-  local bootWimFile="${dir}/sources/boot.wim"
-  local installWimFile="${dir}/sources/install.wim"
+  local bootWimFile="$dir/sources/boot.wim"
+  local installWimFile="$dir/sources/install.wim"
 
   local msg="Extracting $desc environment..."
   info "$msg" && html "$msg"
 
-  wimlib-imagex export "${iso}" 2 "${bootWimFile}" --compress=LZX --chunk-size 32K --quiet || {
+  wimlib-imagex export "$iso" 2 "$bootWimFile" --compress=none --quiet || {
     retVal=$?
     error "Adding WinPE failed" && return ${retVal}
   }
@@ -518,7 +525,7 @@ extractESD() {
   local msg="Extracting $desc setup..."
   info "$msg" && html "$msg"
 
-  wimlib-imagex export "${iso}" 3 "$bootWimFile" --compress=LZX --chunk-size 32K --boot --quiet || {
+  wimlib-imagex export "$iso" 3 "$bootWimFile" --compress=none --boot --quiet || {
    retVal=$?
    error "Adding Windows Setup failed" && return ${retVal}
   }
@@ -540,11 +547,11 @@ extractESD() {
   fi
 
   for (( imageIndex=4; imageIndex<=esdImageCount; imageIndex++ )); do
-    imageEdition=$(wimlib-imagex info "${iso}" ${imageIndex} | grep '^Description:' | sed 's/Description:[ \t]*//')
+    imageEdition=$(wimlib-imagex info "$iso" ${imageIndex} | grep '^Description:' | sed 's/Description:[ \t]*//')
     [[ "${imageEdition,,}" != "${edition,,}" ]] && continue
-    wimlib-imagex export "${iso}" ${imageIndex} "${installWimFile}" --compress=LZMS --chunk-size 128K --quiet || {
+    wimlib-imagex export "$iso" ${imageIndex} "$installWimFile" --compress=LZMS --chunk-size 128K --quiet || {
       retVal=$?
-      error "Addition of ${imageIndex} to the $desc image failed" && return $retVal
+      error "Addition of $imageIndex to the $desc image failed" && return $retVal
     }
     return 0
   done
@@ -604,75 +611,112 @@ extractImage() {
 
 setXML() {
 
-  [[ "$MANUAL" == [Yy1]* ]] && return 0
-
   local file="/custom.xml"
-  [ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0
+  [ ! -f "$file" ] || [ ! -s "$file" ] && file="$STORAGE/custom.xml"
+  [ ! -f "$file" ] || [ ! -s "$file" ] && file="/run/assets/custom.xml"
+  [ ! -f "$file" ] || [ ! -s "$file" ] && file="$1"
+  [ ! -f "$file" ] || [ ! -s "$file" ] && file="/run/assets/$DETECTED.xml"
+  [ ! -f "$file" ] || [ ! -s "$file" ] && return 1
 
-  file="$STORAGE/custom.xml"
-  [ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0
+  XML="$file"
+  return 0
+}
 
-  file="/run/assets/custom.xml"
-  [ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0
+getPlatform() {
 
-  file="$1"
-  [ -z "$file" ] && file="/run/assets/$DETECTED.xml"
-  [ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0
+  local xml="$1"
+  local tag="ARCH"
+  local platform="x64"
+  local arch
 
-  return 1
+  arch=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml")
+
+  case "${arch,,}" in
+    "0" ) platform="x86" ;;
+    "9" ) platform="x64" ;;
+    "12" )platform="arm64" ;;
+  esac
+
+  echo "$platform"
+  return 0
+}
+
+hasVersion() {
+
+  local id="$1"
+  local tag="$2"
+  local xml="$3"
+  local edition
+
+  [ ! -f "/run/assets/$id.xml" ] && return 1
+
+  edition=$(printEdition "$id" "")
+  [ -z "$edition" ] && return 1
+  [[ "${xml,,}" != *"<${tag,,}>${edition,,}</${tag,,}>"* ]] && return 1
+
+  return 0
 }
 
 selectVersion() {
 
   local tag="$1"
   local xml="$2"
-  local id find name prefer
+  local platform="$3"
+  local id name prefer
 
   name=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml")
   [[ "$name" == *"Operating System"* ]] && name=""
   [ -z "$name" ] && return 0
 
-  id=$(fromName "$name")
+  id=$(fromName "$name" "$platform")
   [ -z "$id" ] && warn "Unknown ${tag,,}: '$name'" && return 0
 
   prefer="$id-enterprise"
-  [ -f "/run/assets/$prefer.xml" ] && find=$(printEdition "$prefer" "") || find=""
-  if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then
-    echo "$prefer" && return 0
-  fi
+  hasVersion "$prefer" "$tag" "$xml" && echo "$prefer" && return 0
 
   prefer="$id-ultimate"
-  [ -f "/run/assets/$prefer.xml" ] && find=$(printEdition "$prefer" "") || find=""
-  if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then
-    echo "$prefer" && return 0
-  fi
+  hasVersion "$prefer" "$tag" "$xml" && echo "$prefer" && return 0
 
   prefer="$id"
-  [ -f "/run/assets/$prefer.xml" ] && find=$(printEdition "$prefer" "") || find=""
-  if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then
-    echo "$prefer" && return 0
-  fi
+  hasVersion "$prefer" "$tag" "$xml" && echo "$prefer" && return 0
 
-  prefer=$(getVersion "$name")
+  prefer=$(getVersion "$name" "$platform")
 
   echo "$prefer"
   return 0
 }
 
+checkPlatform() {
+
+  local xml="$1"
+  local platform compat
+
+  platform=$(getPlatform "$xml")
+
+  case "${platform,,}" in
+    "x86" ) compat="x64" ;;
+    "x64" ) compat="$platform" ;;
+    "arm64" ) compat="$platform" ;;
+    * ) compat="${PLATFORM,,}" ;;
+  esac
+
+  [[ "${compat,,}" == "${PLATFORM,,}" ]] && return 0
+
+  error "You cannot boot ${platform^^} images on a $PLATFORM CPU!"
+  return 1
+}
+
 detectVersion() {
 
   local xml="$1"
-  local id=""
+  local id platform
 
-  id=$(selectVersion "DISPLAYNAME" "$xml")
-  [ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0
-
-  id=$(selectVersion "PRODUCTNAME" "$xml")
-  [ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0
-
-  id=$(selectVersion "NAME" "$xml")
-  [ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0
+  platform=$(getPlatform "$xml")
+  id=$(selectVersion "DISPLAYNAME" "$xml" "$platform")
+  [ -z "$id" ] && id=$(selectVersion "PRODUCTNAME" "$xml" "$platform")
+  [ -z "$id" ] && id=$(selectVersion "NAME" "$xml" "$platform")
 
+  echo "$id"
   return 0
 }
 
@@ -684,18 +728,20 @@ detectImage() {
 
   XML=""
 
-  if [ -z "$DETECTED" ] && [[ "${version,,}" != "http"* ]]; then
-    [ -z "$CUSTOM" ] && DETECTED="$version"
+  if [ -z "$DETECTED" ] && [ -z "$CUSTOM" ]; then
+    [[ "${version,,}" != "http"* ]] && DETECTED="$version"
   fi
 
   if [ -n "$DETECTED" ]; then
 
     [[ "${DETECTED,,}" == "winxp"* ]] && return 0
 
-    setXML "" && return 0
+    if ! setXML "" && [[ "$MANUAL" != [Yy1]* ]]; then
+      MANUAL="Y"
+      desc=$(printEdition "$DETECTED" "this version")
+      warn "the answer file for $desc was not found ($DETECTED.xml), $FB."
+    fi
 
-    desc=$(printEdition "$DETECTED" "this version")
-    warn "the answer file for $desc was not found ($DETECTED.xml), $FB."
     return 0
   fi
 
@@ -725,12 +771,19 @@ detectImage() {
   fi
 
   info=$(wimlib-imagex info -xml "$loc" | tr -d '\000')
+  ! checkPlatform "$info" && exit 67
+
   DETECTED=$(detectVersion "$info")
 
   if [ -z "$DETECTED" ]; then
     msg="Failed to determine Windows version from image"
-    setXML "" && info "${msg}!" && return 0
-    warn "${msg}, $FB" && return 0
+    if setXML "" || [[ "$MANUAL" == [Yy1]* ]]; then
+      info "${msg}!"
+    else
+      MANUAL="Y"
+      warn "${msg}, $FB."
+    fi
+    return 0
   fi
 
   desc=$(printEdition "$DETECTED" "$DETECTED")
@@ -741,9 +794,13 @@ detectImage() {
   msg="the answer file for $desc was not found ($DETECTED.xml)"
   local fallback="/run/assets/${DETECTED%%-*}.xml"
 
-  setXML "$fallback" && warn "${msg}." && return 0
+  if setXML "$fallback" || [[ "$MANUAL" == [Yy1]* ]]; then
+    [[ "$MANUAL" != [Yy1]* ]] && warn "${msg}."
+  else
+    MANUAL="Y"
+    warn "${msg}, $FB."
+  fi
 
-  warn "${msg}, $FB."
   return 0
 }
 
@@ -785,12 +842,18 @@ updateImage() {
 
   local dir="$1"
   local asset="$2"
-  local path src loc xml index result
+  local file="autounattend.xml"
+  local org="${file/.xml/.org}"
+  local dat="${file/.xml/.dat}"
+  local desc path src loc xml index result
 
-  [ ! -s "$asset" ] || [ ! -f "$asset" ] && return 0
-
-  path=$(find "$dir" -maxdepth 1 -type f -iname autounattend.xml | head -n 1)
-  [ -n "$path" ] && cp "$asset" "$path"
+  if [ ! -s "$asset" ] || [ ! -f "$asset" ]; then
+    asset=""
+    if [[ "$MANUAL" != [Yy1]* ]]; then
+      MANUAL="Y"
+      warn "no answer file provided, $FB."
+    fi
+  fi
 
   src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1)
 
@@ -807,9 +870,6 @@ updateImage() {
     warn "failed to locate 'boot.wim' or 'boot.esd' in ISO image, $FB" && return 1
   fi
 
-  xml=$(basename "$asset")
-  info "Adding $xml for automatic installation..."
-
   index="1"
   result=$(wimlib-imagex info -xml "$loc" | tr -d '\000')
 
@@ -817,8 +877,56 @@ updateImage() {
     index="2"
   fi
 
-  if ! wimlib-imagex update "$loc" "$index" --command "add $asset /autounattend.xml" > /dev/null; then
-    warn "failed to add answer file ($xml) to ISO image, $FB" && return 1
+  if wimlib-imagex extract "$loc" "$index" "/$file" "--dest-dir=$TMP" >/dev/null 2>&1; then
+    if ! wimlib-imagex extract "$loc" "$index" "/$dat" "--dest-dir=$TMP" >/dev/null 2>&1; then
+      if ! wimlib-imagex extract "$loc" "$index" "/$org" "--dest-dir=$TMP" >/dev/null 2>&1; then
+        if ! wimlib-imagex update "$loc" "$index" --command "rename /$file /$org" > /dev/null; then
+          warn "failed to backup original answer file ($file)."
+        fi
+      fi
+    fi
+    rm -f "$TMP/$dat"
+    rm -f "$TMP/$org"
+    rm -f "$TMP/$file"
+  fi
+
+  if [[ "$MANUAL" != [Yy1]* ]]; then
+
+    xml=$(basename "$asset")
+    info "Adding $xml for automatic installation..."
+
+    if ! wimlib-imagex update "$loc" "$index" --command "add $asset /$file" > /dev/null; then
+      MANUAL="Y"
+      warn "failed to add answer file ($xml) to ISO image, $FB"
+    else
+      wimlib-imagex update "$loc" "$index" --command "add $asset /$dat" > /dev/null || true
+    fi
+
+  fi
+
+  if [[ "$MANUAL" == [Yy1]* ]]; then
+
+    wimlib-imagex update "$loc" "$index" --command "delete --force /$file" > /dev/null || true
+
+    if wimlib-imagex extract "$loc" "$index" "/$org" "--dest-dir=$TMP" >/dev/null 2>&1; then
+      if ! wimlib-imagex update "$loc" "$index" --command "add $TMP/$org /$file" > /dev/null; then
+        warn "failed to restore original answer file ($org)."
+      fi
+      rm -f "$TMP/$org"
+    fi
+
+  fi
+
+  local find="$file"
+  [[ "$MANUAL" == [Yy1]* ]] && find="$org"
+  path=$(find "$dir" -maxdepth 1 -type f -iname "$find" | head -n 1)
+
+  if [ -f "$path" ]; then
+    if [[ "$MANUAL" != [Yy1]* ]]; then
+      mv -f "$path" "${path%.*}.org"
+    else
+      mv -f "$path" "${path%.*}.xml"
+    fi
   fi
 
   return 0
@@ -923,7 +1031,7 @@ buildImage() {
   [ -s "$log" ] && error="$(<"$log")"
   [[ "$error" != "$hide" ]] && echo "$error"
 
-  mv "$out" "$BOOT"
+  ! mv -f "$out" "$BOOT" && return 1
   return 0
 }
 
@@ -931,13 +1039,11 @@ bootWindows() {
 
   rm -rf "$TMP"
 
-  if [ ! -f "$ISO" ] || [ ! -s "$ISO" ]; then
-    ISO="/custom.iso"
-    [ ! -f "$ISO" ] && ISO="${STORAGE}$ISO"
+  if [ ! -f "$BOOT" ] || [ ! -s "$BOOT" ]; then
+    BOOT="/custom.iso"
+    [ ! -f "$BOOT" ] && BOOT="${STORAGE}$BOOT"
   fi
 
-  BOOT="$ISO"
-
   [[ "${PLATFORM,,}" == "arm64" ]] && VGA="virtio-gpu"
 
   if [ -s "$STORAGE/windows.mode" ] && [ -f "$STORAGE/windows.mode" ]; then
@@ -974,10 +1080,10 @@ bootWindows() {
       BOOT_MODE="windows_secure"
       echo "$BOOT_MODE" > "$STORAGE/windows.mode"
       if [ -f "$STORAGE/windows.rom" ] && [ ! -f "$STORAGE/$BOOT_MODE.rom" ]; then
-        mv "$STORAGE/windows.rom" "$STORAGE/$BOOT_MODE.rom"
+        mv -f "$STORAGE/windows.rom" "$STORAGE/$BOOT_MODE.rom"
       fi
       if [ -f "$STORAGE/windows.vars" ] && [ ! -f "$STORAGE/$BOOT_MODE.vars" ]; then
-        mv "$STORAGE/windows.vars" "$STORAGE/$BOOT_MODE.vars"
+        mv -f "$STORAGE/windows.vars" "$STORAGE/$BOOT_MODE.vars"
       fi
     fi
   fi

src/mido.sh

@@ -3,8 +3,6 @@
 # Copyright (C) 2024 Elliot Killick <contact@elliotkillick.com>
 # Licensed under the MIT License. See LICENSE file for details.
 
-[ "$DEBUG" ] && set -x
-
 # Prefer Dash shell for greater security if available
 if [ "$BASH" ] && command -v dash > /dev/null; then
     exec dash "$0" "$@"

src/power.sh

@@ -29,8 +29,10 @@ boot() {
 
   if [ -s "$QEMU_PTY" ]; then
     if [ "$(stat -c%s "$QEMU_PTY")" -gt 7 ]; then
-      info "Windows started succesfully, visit http://localhost:8006/ to view the screen..."
-      return 0
+      if ! grep -Fq "BOOTMGR is missing" "$QEMU_PTY"; then
+        info "Windows started succesfully, visit http://localhost:8006/ to view the screen..."
+        return 0
+      fi
     fi
   fi
 
@@ -48,12 +50,14 @@ ready() {
     local bios="Booting from Hard"
     last=$(grep "^Booting.*" "$QEMU_PTY" | tail -1)
     if [[ "${last,,}" == "${bios,,}"* ]]; then
-      return 0
+      if ! grep -Fq "BOOTMGR is missing" "$QEMU_PTY"; then
+        return 0
+      fi
     fi
     return 1
   fi
 
-  local line="Windows Boot Manager"
+  local line="\"Windows Boot Manager\""
   if grep -Fq "$line" "$QEMU_PTY"; then
     return 0
   fi