diff --git a/Dockerfile b/Dockerfile index c2397c34..fb85773b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ COPY --from=qemux/qemu:7.50 --exclude=usr/bin/qemu-system-x86_64 / / ARG TARGETARCH ARG VERSION_WSDD="1.27" -ARG VERSION_DXVK="2.7.1" +ARG VERSION_DXVK="3.0.2" ARG VERSION_VIRTIO="1.9.61" ARG VERSION_BLINTER="1.0.112" diff --git a/assets/win81x64-enterprise.cmd b/assets/win81x64-enterprise.cmd index cc9cd331..b3acb4e0 100644 --- a/assets/win81x64-enterprise.cmd +++ b/assets/win81x64-enterprise.cmd @@ -96,21 +96,6 @@ rem Install the product key without activating Windows immediately. cscript.exe //B //Nologo "%SystemRoot%\System32\slmgr.vbs" /ipk "XXX" rem END PRODUCT_KEY -rem Trust the VirtIO display driver publisher to avoid an interactive prompt. -powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "$catalog = Get-ChildItem -Path (Join-Path $env:SystemRoot 'Drivers\viogpudo') -Filter '*.cat' | Select-Object -First 1; if ($null -eq $catalog) { exit 1 }; $certificate = (Get-AuthenticodeSignature -LiteralPath $catalog.FullName).SignerCertificate; if ($null -eq $certificate) { exit 1 }; [IO.File]::WriteAllBytes((Join-Path $env:TEMP 'viogpudo.cer'), $certificate.Export([Security.Cryptography.X509Certificates.X509ContentType]::Cert))" - -if not errorlevel 1 ( - certutil.exe -addstore -f TrustedPublisher "%TEMP%\viogpudo.cer" - if not errorlevel 1 ( - pnputil.exe -i -a "%SystemRoot%\Drivers\viogpudo\viogpudo.inf" - ) -) - -del /q "%TEMP%\viogpudo.cer" >nul 2>&1 - -rem Install the VirtIO display driver last to avoid disrupting earlier setup work. -pnputil.exe -i -a "%SystemRoot%\Drivers\viogpudo\viogpudo.inf" - type nul > "%SETUP_COMPLETE%" exit /b 0 diff --git a/assets/win81x64.cmd b/assets/win81x64.cmd index cc9cd331..b3acb4e0 100644 --- a/assets/win81x64.cmd +++ b/assets/win81x64.cmd @@ -96,21 +96,6 @@ rem Install the product key without activating Windows immediately. cscript.exe //B //Nologo "%SystemRoot%\System32\slmgr.vbs" /ipk "XXX" rem END PRODUCT_KEY -rem Trust the VirtIO display driver publisher to avoid an interactive prompt. -powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "$catalog = Get-ChildItem -Path (Join-Path $env:SystemRoot 'Drivers\viogpudo') -Filter '*.cat' | Select-Object -First 1; if ($null -eq $catalog) { exit 1 }; $certificate = (Get-AuthenticodeSignature -LiteralPath $catalog.FullName).SignerCertificate; if ($null -eq $certificate) { exit 1 }; [IO.File]::WriteAllBytes((Join-Path $env:TEMP 'viogpudo.cer'), $certificate.Export([Security.Cryptography.X509Certificates.X509ContentType]::Cert))" - -if not errorlevel 1 ( - certutil.exe -addstore -f TrustedPublisher "%TEMP%\viogpudo.cer" - if not errorlevel 1 ( - pnputil.exe -i -a "%SystemRoot%\Drivers\viogpudo\viogpudo.inf" - ) -) - -del /q "%TEMP%\viogpudo.cer" >nul 2>&1 - -rem Install the VirtIO display driver last to avoid disrupting earlier setup work. -pnputil.exe -i -a "%SystemRoot%\Drivers\viogpudo\viogpudo.inf" - type nul > "%SETUP_COMPLETE%" exit /b 0 diff --git a/src/define.sh b/src/define.sh index e00a644b..84e162fa 100644 --- a/src/define.sh +++ b/src/define.sh @@ -1342,6 +1342,8 @@ getLink4() { [[ "${lang,,}" != "en" && "${lang,,}" != "en-us" ]] && return 0 + return 0 # Disable + case "${id,,}" in "win11x64-ltsc" | "win11x64-enterprise-ltsc" ) size=5144817664 diff --git a/src/legacy.sh b/src/legacy.sh index 81cc9241..38e9be72 100644 --- a/src/legacy.sh +++ b/src/legacy.sh @@ -73,7 +73,7 @@ setMachine() { "win2003"* | "win2008"* | "win2012"*| \ "winvista"* | "win7"* | "win8"* | "reactos" ) - writeState "vga" "vmvga" || return 1 ;; + writeState "vga" "vmware" || return 1 ;; esac