Unverified Commit 61d7e0d3 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Fallback to Windows 11 if version unknown (#1042)

parent e6d7495b

src/define.sh

+2 −0
Original line number Diff line number Diff line
@@ -593,7 +593,9 @@ fromName() { 
    *"windows 7"* ) id="win7${arch}" ;;

    *"windows 8"* ) id="win81${arch}" ;;

    *"windows 10"* ) id="win10${arch}" ;;

    *"optimum 10"* ) id="win10${arch}" ;;

    *"windows 11"* ) id="win11${arch}" ;;

    *"optimum 11"* ) id="win11${arch}" ;;

    *"windows vista"* ) id="winvista${arch}" ;;

    *"server 2025"* ) id="win2025${add}" ;;

    *"server 2022"* ) id="win2022${add}" ;;

src/install.sh

+12 −1
Original line number Diff line number Diff line
@@ -680,8 +680,13 @@ addDriver() { 
  local path="$2"

  local target="$3"

  local driver="$4"

  local desc=""

  local folder=""



  if [ -z "$id" ]; then

    warn "no Windows version specified for \"$driver\" driver!" && return 0

  fi



  case "${id,,}" in

    "win7x86"* ) folder="w7/x86" ;;

    "win7x64"* ) folder="w7/amd64" ;;
@@ -701,7 +706,8 @@ addDriver() { 
  esac



  if [ -z "$folder" ]; then

    warn "no \"$driver\" driver found for \"$DETECTED\" !" && return 0

    desc=$(printVersion "$id" "$id")

    warn "no \"$driver\" driver available for \"$desc\" !" && return 0

  fi



  [ ! -d "$path/$driver/$folder" ] && return 0
@@ -734,6 +740,11 @@ addDrivers() { 
  local msg="Adding drivers to image..."

  info "$msg" && html "$msg"



  if [ -z "$version" ]; then

    version="win11x64"

    warn "Windows version unknown, falling back to Windows 11 drivers..."

  fi



  if ! bsdtar -xf /drivers.txz -C "$drivers"; then

    error "Failed to extract drivers from archive!" && return 1

  fi