feat: Avoid ISO rebuilding for dramatically faster preparation (#2032)

docs/environment.md

@@ -163,7 +163,6 @@ Also see [Dynamic memory allocation](https://github.com/qemus/qemu/blob/master/d
 | `VERIFY` | `N` | Verifies downloaded installation media against predefined checksums. |
 | `REMOVE` | `Y` | Deletes the downloaded Windows ISO after installation to save space. |
 | `MANUAL` | `N` | Enables manual installation instead of unattended installation. |
-| `REBUILD` | `Y` | Skips rebuilding the Windows ISO and uses the original image unchanged. |
 | `COMMAND` |  | Command to be executed during the final step of automatic installation. |
 
 ## 🔌 Shutdown

src/define.sh

@@ -11,7 +11,6 @@ set -Eeuo pipefail
 : "${EDITION:=""}"
 : "${MANUAL:=""}"
 : "${REMOVE:=""}"
-: "${REBUILD:=""}"
 : "${VERSION:=""}"
 : "${COMMAND:=""}"
 : "${DETECTED:=""}"
@@ -976,6 +975,31 @@ getVersion() {
   return 0
 }
 
+skipVersion() {
+
+  local id="$1"
+
+  case "${id,,}" in
+    "win9"* | "winxp"* | "win2k"* | "win2003"* | "reactos" )
+      return 0 ;;
+  esac
+
+  return 1
+}
+
+isLegacy() {
+
+  local id="$1"
+
+  case "${id,,}" in
+    "win9"* | "win2k"* | "winxp"* | "win2003"* | \
+    "winvista"* | "win7"* | "win2008"* | "reactos" )
+      return 0 ;;
+  esac
+
+  return 1
+}
+
 switchEdition() {
 
   local -n id="$1"

src/image.sh

@@ -84,29 +84,6 @@ getCompatibleVersions() {
   fi
 }
 
-hasAnswerFile() {
-
-  local id="$1"
-  local file="/run/assets/$id.xml"
-
-  [ -s "$file" ] && return 0
-
-  if [[ "${id,,}" == *"-eval" ]]; then
-    file="/run/assets/${id%-eval}.xml"
-    [ -s "$file" ] && return 0
-  fi
-
-  # Editions without a dedicated template can use the generic template.
-  case "${id,,}" in
-    "win7"* | "win8"* | "win10"* | "win11"* | "winvista"* | "win20"* )
-      file="/run/assets/${id%%-*}.xml"
-      [ -s "$file" ] && return 0
-      ;;
-  esac
-
-  return 1
-}
-
 getVersionPriority() {
 
   local id="${1,,}"
@@ -433,7 +410,7 @@ detectVersion() {
   local -a bases=()
   local -a groups=()
   local -a versions=()
-  local -a edition_order=()
+  local -a selection_order=()
   local -A image_indexes=()
 
   printf -v "$result_name" '%s' ""
@@ -454,7 +431,7 @@ detectVersion() {
       ;;
   esac
 
-  getEditionOrder "${bases[0]}" edition_order || return 1
+  getEditionOrder "${bases[0]}" selection_order || return 1
 
   selectEdition \
     versions \
@@ -465,7 +442,7 @@ detectVersion() {
     "$result_name" \
     "$index_name" \
     "$normalize_name" \
-    edition_order && return 0
+    selection_order && return 0
 
   local result="${versions[0]}"
   local key="${result,,}"
@@ -506,18 +483,230 @@ detectLanguage() {
   return 0
 }
 
-skipVersion() {
+getImageSize() {
+
+  local stage="$1"
+  local folder="${2:-}"
+  local mib=$((1024 * 1024))
+  local minimum=$((64 * mib))
+  local size bytes path
+  local required large_file
+  local payload=0 paths=("$stage")
+
+  if [ ! -d "$stage" ]; then
+    error "Failed to find setup directory: $stage"
+    return 1
+  fi
+
+  [ -n "$folder" ] && paths+=("$folder")
+
+  large_file=$(find -L "${paths[@]}" \
+    -type f \
+    -size +4294967295c \
+    -print \
+    -quit) || return 1
+
+  if [ -n "$large_file" ]; then
+    error "Setup file exceeds the FAT32 limit: $large_file"
+    return 1
+  fi
+
+  for path in "${paths[@]}"; do
+    if ! read -r bytes _ < <(
+      du -Llsb --apparent-size -- "$path"
+    ); then
+      error "Failed to calculate setup size!"
+      return 1
+    fi
+
+    payload=$((payload + bytes))
+  done
+
+  required=$((payload + ((payload + 3) / 4) + (32 * mib)))
+  size="$minimum"
+
+  while ((size < required)); do
+    size=$((size * 2))
+  done
+
+  printf '%s\n' "$size"
+}
+
+bootDirect() {
 
   local id="$1"
 
   case "${id,,}" in
-    "win9"* | "winxp"* | "win2k"* | "win2003"* | "reactos" )
+    "reactos" ) return 0 ;;
-      return 0 ;;
   esac
 
   return 1
 }
 
+canUseSetupImage() {
+
+  local id="$1"
+  local iso="$2"
+
+  case "${id,,}" in
+    "win9"* | "winxp"* | "win2k"* | "win2003"* | "reactos" )
+      return 1 ;;
+  esac
+
+  [[ "${iso,,}" != *".esd" ]] &&
+    ! enabled "${UNPACK:-}"
+}
+
+createImageDirectory() {
+
+  local image="$1"
+  local directory="$2"
+
+  if mdir -i "$image" "$directory" >/dev/null 2>&1; then
+    return 0
+  fi
+
+  mmd -i "$image" "$directory" >/dev/null
+}
+
+createSetupImage() {
+
+  local stage="$1"
+  local image="$2"
+  local tmp="${image}.tmp"
+  local target="::/\$OEM\$/\$1/OEM"
+  local install="$stage/.overlay-install.bat"
+  local folder size sectors entry find_pid
+  local entries=()
+
+  folder=$(getOemFolder) || return 1
+
+  if ! size=$(getImageSize "$stage" "$folder"); then
+    return 1
+  fi
+
+  sectors=$((size / 512))
+
+  local msg="Writing overlay image..."
+  info "$msg" && html "$msg"
+
+  rm -f -- "$tmp" || return 1
+
+  if ! mformat \
+    -i "$tmp" \
+    -C \
+    -F \
+    -T "$sectors" \
+    -v "SETUP" \
+    ::; then
+    rm -f -- "$tmp"
+    error "Failed to format setup image!"
+    return 1
+  fi
+
+  mapfile -d '' entries < <(
+    find "$stage" \
+      -mindepth 1 \
+      -maxdepth 1 \
+      ! -name '.overlay-install.bat' \
+      -print0
+  )
+
+  find_pid=$!
+
+  if ! wait "$find_pid"; then
+    rm -f -- "$tmp"
+    error "Failed to enumerate image files!"
+    return 1
+  fi
+
+  for entry in "${entries[@]}"; do
+    if ! mcopy -Q -s -i "$tmp" "$entry" ::; then
+      rm -f -- "$tmp"
+      error "Failed to copy image file: $entry"
+      return 1
+    fi
+  done
+
+  if [ -n "$folder" ] || [ -f "$install" ]; then
+    if ! createImageDirectory "$tmp" "::/\$OEM\$" ||
+      ! createImageDirectory "$tmp" "::/\$OEM\$/\$1" ||
+      ! createImageDirectory "$tmp" "$target"; then
+      rm -f -- "$tmp"
+      error "Failed to create OEM directory in setup image!"
+      return 1
+    fi
+  fi
+
+  if [ -n "$folder" ]; then
+
+    mapfile -d '' entries < <(
+      find "$folder" -mindepth 1 -maxdepth 1 -print0
+    )
+
+    find_pid=$!
+
+    if ! wait "$find_pid"; then
+      rm -f -- "$tmp"
+      error "Failed to enumerate OEM files!"
+      return 1
+    fi
+
+    for entry in "${entries[@]}"; do
+      if ! mcopy -Q -s -o -i "$tmp" "$entry" "$target"; then
+        rm -f -- "$tmp"
+        error "Failed to copy OEM file: $entry"
+        return 1
+      fi
+    done
+
+  fi
+
+  if [ -f "$install" ]; then
+    if ! mcopy -Q -o -i "$tmp" "$install" "$target/install.bat"; then
+      rm -f -- "$tmp"
+      error "Failed to replace install.bat in setup image!"
+      return 1
+    fi
+  fi
+
+  if ! mdir -i "$tmp" :: >/dev/null; then
+    rm -f -- "$tmp"
+    error "Failed to verify image!"
+    return 1
+  fi
+
+  if ! enabled "$MANUAL"; then
+
+    local answer="$stage/Autounattend.xml"
+
+    if [ ! -f "$answer" ] || [ ! -s "$answer" ]; then
+      rm -f -- "$tmp"
+      error "Failed to find staged answer file: $answer"
+      return 1
+    fi
+
+    if ! mtype -i "$tmp" ::/Autounattend.xml | cmp -s - "$answer"; then
+      rm -f -- "$tmp"
+      error "Failed to verify staged answer file!"
+      return 1
+    fi
+
+  fi
+
+  if ! mv -f -- "$tmp" "$image"; then
+    rm -f -- "$tmp"
+    error "Failed to save setup image: $image"
+    return 1
+  fi
+
+  if ! setOwner "$image"; then
+    warn "Failed to set the owner for \"$image\" !"
+  fi
+
+  return 0
+}
+
 detectLegacy() {
 
   local dir="$1"
@@ -655,11 +844,19 @@ resolveImage() {
 
   local version="$1"
 
+  XML=""
+  FB="falling back to manual installation!"
+
   [ -z "$DETECTED" ] || return 0
-  [ -z "$CUSTOM" ] || return 1
   [ -z "${REUSED_ISO:-}" ] || return 1
   [[ "${version,,}" != "http"* ]] || return 1
 
+  if [ -n "$CUSTOM" ]; then
+    bootDirect "$version" || return 1
+    DETECTED="$version"
+    return 0
+  fi
+
   local file="/run/assets/$version.xml"
 
   if [ -s "$file" ]; then
@@ -836,16 +1033,8 @@ configureImage() {
 detectImage() {
 
   local dir="$1"
-  local version="$2"
   local desc
 
-  XML=""
-
-  if resolveImage "$version"; then
-    setImage || return 1
-    return 0
-  fi
-
   info "Detecting version from ISO image..."
 
   if detectLegacy "$dir" || detectReactOS "$dir"; then
@@ -1114,90 +1303,19 @@ extractBootImage() {
   local iso="$1"
   local dir="$2"
   local desc="$3"
-
+  local offset info
-  local tmp="$TMP/boot-images"
-  local rc size offset image=""
-  local msg="using legacy extraction..."
-  local expected_size=$((BOOT_LOAD_SIZE * 512))
-  local max_extract_size=$((64 * 1024 * 1024))
-  local boot_info
-  local -a images=()
 
   ETFS="boot.img"
+
   [ -s "$dir/$ETFS" ] && return 0
-
   rm -f "$dir/$ETFS" || return 1
-  rm -rf "$tmp" || return 1
 
-  if command -v prlimit >/dev/null 2>&1; then
+  if ! info=$(isoinfo -d -i "$iso"); then
-    LC_ALL=C prlimit \
-      "--fsize=$max_extract_size:$max_extract_size" \
-      xorriso \
-        -no_rc \
-        -osirrox on \
-        -indev "$iso" \
-        -extract_boot_images "$tmp" >/dev/null 2>&1
-    rc=$?
-
-    if (( rc == 0 )); then
-      mapfile -t images < <(
-        find "$tmp" \
-          -maxdepth 1 \
-          -type f \
-          -name 'eltorito_img*_bios.img' \
-          -print
-      )
-
-      if (( ${#images[@]} == 1 )); then
-        image="${images[0]}"
-
-        if [ ! -s "$image" ]; then
-          warn "The extracted BIOS boot image is empty, $msg"
-        elif ! size=$(stat -c%s "$image"); then
-          warn "Failed to determine the BIOS boot image size, $msg"
-        elif (( size != expected_size )); then
-          info "The extracted BIOS boot image has an unexpected size, $msg"
-        else
-          if ! mv -f "$image" "$dir/$ETFS"; then
-            rm -rf "$tmp" || true
-            error "Failed to save boot image from $desc ISO!"
-            return 1
-          fi
-
-          rm -rf "$tmp" || return 1
-          return 0
-        fi
-
-      elif (( ${#images[@]} > 1 )); then
-        warn "Multiple BIOS boot images were found, $msg"
-      else
-        warn "No BIOS boot image was found, $msg"
-      fi
-
-    elif (( rc == 153 )); then
-      info "The extracted BIOS boot image exceeded the size limit, $msg"
-
-    else
-      if (( rc > 128 )); then
-        rm -rf "$tmp" || true
-        exit "$rc"
-      fi
-
-      warn "Failed to extract the BIOS boot image, $msg"
-    fi
-
-  else
-    warn "The prlimit utility is unavailable, $msg"
-  fi
-
-  rm -rf "$tmp" || true
-
-  if ! boot_info=$(isoinfo -d -i "$iso"); then
     error "Failed to read boot image information from $desc ISO!"
     return 1
   fi
 
-  offset=$(awk '/Bootoff / { print $NF; exit }' <<< "$boot_info")
+  offset=$(awk '/Bootoff / { print $NF; exit }' <<< "$info")
 
   if [ -z "$offset" ]; then
     error "Failed to determine boot image offset from $desc ISO!"
@@ -1216,6 +1334,7 @@ extractBootImage() {
       "count=$BOOT_LOAD_SIZE" \
       "skip=$((offset * 4))" \
       status=none; then
+
     rm -f "$dir/$ETFS" || true
     error "Failed to extract boot image from $desc ISO!"
     return 1

src/mido.sh

@@ -921,7 +921,7 @@ verifyFile() {
   local hash
 
   [ -z "$check" ] && return 0
-  ! enabled "$VERIFY" && return 0
+  enabled "$VERIFY" || return 0
   [[ "${#check}" == "40" ]] && algo="SHA1"
 
   local msg="Verifying downloaded ISO..."

src/power.sh

@@ -11,6 +11,7 @@ SHUTDOWN_SIGNAL=0
 
 QEMU_PTY="$QEMU_DIR/qemu.pty"
 QEMU_END="$QEMU_DIR/qemu.end"
+ACPI_SOCKET="$QEMU_DIR/acpi.sock"
 CONSOLE_PID="$QEMU_DIR/console.pid"
 CONSOLE_SOCKET="$QEMU_DIR/console.sock"
 QEMU_START_PID="$QEMU_DIR/qemu.start.pid"
@@ -28,52 +29,92 @@ bootStatus() {
     last="${line#*:}"
     recent=$(tail -n +"${line%%:*}" "$QEMU_PTY")
 
-    if [[ "$last" == "Booting from DVD/CD"* ]]; then
-      return 0
-    fi
-
     grep -Fq "Loading FreeLoader..." <<< "$recent" && return 0
 
-    grep -Fq \
+    if grep -Fq \
       -e "No bootable device." \
       -e "BOOTMGR is missing" \
-      -e "Boot failed: not a bootable disk" \
+      <<< "$recent"; then
-      -e "Boot failed: could not read the boot disk" \
+      return 2
-      <<< "$recent" && return 1
+    fi
 
-    return 0
+    if grep -Fq \
+      -e "Boot failed: not a bootable disk" \
+      -e "Boot failed: Could not read from CDROM" \
+      -e "Boot failed: could not read the boot disk" \
+      <<< "$recent"; then
+      return 5
+    fi
+
+    if [[ "$last" == "Booting from Hard Disk"* ]]; then
+      return 3
+    fi
+
+    if [[ "$last" == "Booting from DVD/CD"* ]]; then
+      return 4
+    fi
+
+    return 1
   fi
 
-  grep -Fq "UEFI Interactive Shell" "$QEMU_PTY" && return 2
+  local line last recent
 
-  local last
+  line=$(grep -nE \
-  last=$(grep -E \
     'BdsDxe: starting Boot[[:xdigit:]]{4} ' \
     "$QEMU_PTY" | tail -1)
 
-  [ -z "$last" ] && return 1
+  [ -z "$line" ] && return 1
+
+  last="${line#*:}"
+  recent=$(tail -n +"${line%%:*}" "$QEMU_PTY")
+
+  if [[ "$last" == *'"Windows Boot Manager"'* ]]; then
+    return 0
+  fi
+
+  grep -Eq \
+    'BdsDxe: failed to start Boot[[:xdigit:]]{4} "UEFI QEMU .*DVD-ROM.*: Time out' \
+    <<< "$recent" && return 2
+
+  grep -Fq "UEFI Interactive Shell" <<< "$recent" && return 2
 
   grep -Eq \
-    -e '"Windows Boot Manager"' \
     -e '"UEFI QEMU .*DVD-ROM' \
     -e 'CDROM\(' \
     -e 'USB\(' \
-    <<< "$last"
+    <<< "$last" && return 4
+
+  return 1
 }
 
 waitForBoot() {
 
   local pid="$1"
   local timeout="${2:-30}"
+  local keySent=0
+  local pendingType=0
+  local pendingLine=""
+  local pendingDeadline=0
+  local keyDelay status marker
   local deadline=$((SECONDS + timeout))
   local screen="visit http://127.0.0.1:$WEB_PORT/ to view the screen..."
 
   while isAlive "$pid"; do
 
+    if (( ! keySent )) && needsBootKey; then
+
+      if keyDelay=$(bootKeyDelay); then
+        if sendKey spc "$keyDelay" 500; then
+          keySent=1
+        fi
+      fi
+
+    fi
+
     if bootStatus; then
-      local status=0
+      status=0
     else
-      local status=$?
+      status=$?
     fi
 
     case "$status" in
@@ -90,9 +131,47 @@ waitForBoot() {
 
       2) echo
 
-         error "$(app) could not boot, aborting..."
+        error "$(app) could not boot, aborting..."
-         terminateQemu
+        terminateQemu
-         return 0 ;;
+        return 0 ;;
+
+      3 | 4)
+
+        marker=$(getBootMarker)
+
+        if [[ "$marker" != "$pendingLine" ]] || (( status != pendingType )); then
+          pendingLine="$marker"
+          pendingType=$status
+
+          pendingDeadline=$((SECONDS + 6))
+        fi
+
+        if (( pendingDeadline > 0 && SECONDS >= pendingDeadline )); then
+          echo
+
+          if [[ "${DISPLAY,,}" == "web" ]] && ! disabled "${WEB:-Y}"; then
+            info "$(app) started successfully, $screen"
+          else
+            info "$(app) started successfully."
+          fi
+
+          echo && return 0
+        fi
+        ;;
+
+      5)
+
+        pendingType=0
+        pendingLine=""
+        pendingDeadline=0
+        ;;
+
+      *)
+
+        pendingType=0
+        pendingLine=""
+        pendingDeadline=0
+        ;;
 
     esac
 
@@ -101,7 +180,7 @@ waitForBoot() {
     sleep 0.25
   done
 
-  ! isAlive "$pid" && return 0
+  isAlive "$pid" || return 0
   [ -f "$QEMU_END" ] && return 0
 
   error "Timeout while waiting for QEMU to boot the machine, aborting..."
@@ -149,12 +228,100 @@ ready() {
     "$QEMU_PTY" | tail -1)
 
   grep -Eq \
-    'BdsDxe: starting Boot[[:xdigit:]]{4} "Windows Boot Manager" from HD\(' \
+    'BdsDxe: starting Boot[[:xdigit:]]{4} "Windows Boot Manager" from .*HD\(' \
     <<< "$last" && return 0
 
   return 1
 }
 
+sendKey() {
+
+  local key="$1"
+  local delay="${2:-0}"
+  local hold="${3:-100}"
+  local output
+
+  [ ! -S "$ACPI_SOCKET" ] && return 1
+  [[ "$delay" != "0" ]] && sleep "$delay"
+
+  if ! output=$(
+    printf 'sendkey %s %s\n' "$key" "$hold" |
+      nc -q 1 -w 1 -U "$ACPI_SOCKET" 2>&1
+  ); then
+    return 1
+  fi
+
+  if grep -Eqi \
+    -e 'unknown command' \
+    -e 'unknown key' \
+    -e 'invalid parameter' \
+    -e 'invalid key' \
+    -e '^error:' \
+    <<< "$output"; then
+
+    warn "failed to send boot key through QEMU monitor!"
+
+    if enabled "${DEBUG:-}"; then
+      echo "$output"
+    fi
+
+    return 1
+  fi
+
+  return 0
+}
+
+supportsBootKey() {
+
+  local id="$1"
+
+  [[ "${id,,}" == "win"* ]]
+}
+
+needsBootKey() {
+
+  [ ! -s "$BOOT" ] && return 1
+  [[ "${BOOT,,}" != *".iso" ]] && return 1
+  [ -f "$STORAGE/windows.boot" ] && return 1
+
+  supportsBootKey "$DETECTED"
+}
+
+bootKeyDelay() {
+
+  [ ! -s "$QEMU_PTY" ] && return 1
+
+  if grep -Fq "Press any key to" "$QEMU_PTY"; then
+    echo 0
+    return 0
+  fi
+
+  if [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then
+    grep -Fq "Booting from DVD/CD" "$QEMU_PTY" || return 1
+  else
+    grep -Eq \
+      'BdsDxe: starting Boot[[:xdigit:]]{4} "UEFI QEMU .*DVD-ROM' \
+      "$QEMU_PTY" || return 1
+  fi
+
+  echo 0.5
+  return 0
+}
+
+getBootMarker() {
+
+  if [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then
+    grep -nE '^Booting from (Hard Disk|DVD/CD)' "$QEMU_PTY" | tail -1
+    return 0
+  fi
+
+  grep -nE \
+    'BdsDxe: starting Boot[[:xdigit:]]{4} ' \
+    "$QEMU_PTY" | tail -1
+
+  return 0
+}
+
 markWindowsBooted() {
 
   local file="$STORAGE/windows.boot"
@@ -164,7 +331,7 @@ markWindowsBooted() {
   fi
 
   # Remove CD-ROM ISO after install
-  ! ready && return 0
+  ready || return 0
 
   if ! touch "$file"; then
     warn "failed to create Windows installation marker!"
@@ -288,7 +455,7 @@ gracefulShutdown() {
   finish "$code"
 }
 
-! enabled "$SHUTDOWN" && return 0
+enabled "$SHUTDOWN" || return 0
 [ -n "${QEMU_TIMEOUT:-}" ] && TIMEOUT="$QEMU_TIMEOUT"
 
 if interactive; then

src/samba.sh

@@ -142,21 +142,25 @@ addShare() {
 
   fi
 
-  if [[ "$writable" == "Y" ]] && [[ "$empty" == "Y" ]]; then
+  if [[ "$writable" == "Y" ]]; then
 
-    if ! chmod 2777 "$dir"; then
+    if [[ "$empty" == "Y" ]]; then
-      error "Failed to set permissions for directory $dir" && return 1
-    fi
 
-    if ! owner=$(stat -c %u "$dir"); then
+      if ! chmod 2777 "$dir"; then
-      error "Failed to determine ownership for directory $dir"
+        error "Failed to set permissions for directory $dir" && return 1
-      return 1
-    fi
-
-    if [[ "$owner" == "0" ]]; then
-      if ! chown "1000:1000" "$dir"; then
-        error "Failed to set ownership for directory $dir" && return 1
       fi
+
+      if ! owner=$(stat -c %u "$dir"); then
+        error "Failed to determine ownership for directory $dir"
+        return 1
+      fi
+
+      if [[ "$owner" == "0" ]]; then
+        if ! chown "1000:1000" "$dir"; then
+          error "Failed to set ownership for directory $dir" && return 1
+        fi
+      fi
+
     fi
 
   elif [[ "$readonly" != "Y" ]]; then