random-mirrors/dockur-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-03-29 04:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kroese 2025-02-17 18:59:40 +01:00 committed by GitHub
parent e6d7495bac
commit 61d7e0d3be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/define.sh
View File

@ -593,7 +593,9 @@ fromName() {
*"windows 7"* ) id="win7${arch}" ;; *"windows 7"* ) id="win7${arch}" ;;
*"windows 8"* ) id="win81${arch}" ;; *"windows 8"* ) id="win81${arch}" ;;
*"windows 10"* ) id="win10${arch}" ;; *"windows 10"* ) id="win10${arch}" ;;
*"optimum 10"* ) id="win10${arch}" ;;
*"windows 11"* ) id="win11${arch}" ;; *"windows 11"* ) id="win11${arch}" ;;
*"optimum 11"* ) id="win11${arch}" ;;
*"windows vista"* ) id="winvista${arch}" ;; *"windows vista"* ) id="winvista${arch}" ;;
*"server 2025"* ) id="win2025${add}" ;; *"server 2025"* ) id="win2025${add}" ;;
*"server 2022"* ) id="win2022${add}" ;; *"server 2022"* ) id="win2022${add}" ;;

13
src/install.sh
View File

@ -680,8 +680,13 @@ addDriver() {
local path="$2" local path="$2"
local target="$3" local target="$3"
local driver="$4" local driver="$4"
local desc=""
local folder="" local folder=""
if [ -z "$id" ]; then
warn "no Windows version specified for \"$driver\" driver!" && return 0
fi
case "${id,,}" in case "${id,,}" in
"win7x86"* ) folder="w7/x86" ;; "win7x86"* ) folder="w7/x86" ;;
"win7x64"* ) folder="w7/amd64" ;; "win7x64"* ) folder="w7/amd64" ;;
@ -701,7 +706,8 @@ addDriver() {
esac esac
if [ -z "$folder" ]; then 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 fi
[ ! -d "$path/$driver/$folder" ] && return 0 [ ! -d "$path/$driver/$folder" ] && return 0
@ -734,6 +740,11 @@ addDrivers() {
local msg="Adding drivers to image..." local msg="Adding drivers to image..."
info "$msg" && html "$msg" 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 if ! bsdtar -xf /drivers.txz -C "$drivers"; then
error "Failed to extract drivers from archive!" && return 1 error "Failed to extract drivers from archive!" && return 1
fi fi