diff --git a/Dockerfile b/Dockerfile index bf6dab2..4d07613 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG VERSION_ARG="latest" FROM scratch AS build-amd64 -COPY --from=qemux/qemu:7.27 / / +COPY --from=qemux/qemu:7.28 / / ARG TARGETARCH ARG DEBCONF_NOWARNINGS="yes" diff --git a/src/define.sh b/src/define.sh index cdfa07a..d8050cd 100644 --- a/src/define.sh +++ b/src/define.sh @@ -1915,16 +1915,16 @@ setMachine() { USB="no" VGA="cirrus" DISK_TYPE="auto" - ADAPTER="rtl8139" MACHINE="pc-i440fx-2.4" - BOOT_MODE="windows_legacy" ;; + BOOT_MODE="windows_legacy" + [ -z "${ADAPTER:-}" ] && ADAPTER="pcnet" ;; "win2k"* ) VGA="cirrus" MACHINE="pc" USB="pci-ohci" DISK_TYPE="auto" - ADAPTER="rtl8139" - BOOT_MODE="windows_legacy" ;; + BOOT_MODE="windows_legacy" + [ -z "${ADAPTER:-}" ] && ADAPTER="rtl8139" ;; "winxp"* | "win2003"* ) DISK_TYPE="blk" BOOT_MODE="windows_legacy" ;;