From fd9402c45ab39dbed9eef24ff83f8579d9eaef4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Sun, 14 Nov 2021 14:19:15 +0100 Subject: [PATCH] Defined machine type explicitly --- Dockerfile.m4 | 4 ++-- scripts/service/qemu/run | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.m4 b/Dockerfile.m4 index 2aba29a..b71e31f 100644 --- a/Dockerfile.m4 +++ b/Dockerfile.m4 @@ -52,7 +52,7 @@ ARG NCAT_ZIP_CHECKSUM=9cdc2e688410f4563af7002d8dfa3f8a5710f15f6d409be2cab4e87890 RUN curl -Lo /tmp/ncat.zip "${NCAT_ZIP_URL:?}" RUN printf '%s' "${NCAT_ZIP_CHECKSUM:?} /tmp/ncat.zip" | sha256sum -c -# Download ReactOS ISO +# Download and install ReactOS ARG REACTOS_ISO_URL=https://downloads.sourceforge.net/project/reactos/ReactOS/0.4.14/ReactOS-0.4.14-RC-118-gfef1907-iso.zip ARG REACTOS_ISO_CHECKSUM=751984454d54f16d39b02e4cfa88ce8adb4a5e666e985a137257fc9980047d65 RUN curl -Lo /tmp/reactos.zip "${REACTOS_ISO_URL:?}" @@ -67,7 +67,7 @@ RUN 7z e /tmp/ncat.zip -so '**/*.exe' > /tmp/reactos/reactos/3rdParty/ncat.exe RUN mkisofs -no-emul-boot -iso-level 4 -eltorito-boot loader/isoboot.bin -o /tmp/reactos.iso /tmp/reactos/ \ && qemu-img create -f qcow2 /tmp/reactos.qcow2 128G \ && timeout 900 qemu-system-x86_64 \ - -accel tcg -smp 2 -m 512M \ + -machine pc -smp 2 -m 512M -accel tcg \ -serial stdio -device VGA -display none \ -device e1000,netdev=n0 -netdev user,id=n0,restrict=on \ -drive file=/tmp/reactos.qcow2,index=0,media=disk,format=qcow2 \ diff --git a/scripts/service/qemu/run b/scripts/service/qemu/run index a867f13..faeb15d 100755 --- a/scripts/service/qemu/run +++ b/scripts/service/qemu/run @@ -3,7 +3,7 @@ set -eu set -- -set -- "$@" -smp "${VM_CPU:?}" -m "${VM_RAM:?}" +set -- "$@" -machine pc -smp "${VM_CPU:?}" -m "${VM_RAM:?}" set -- "$@" -serial stdio -monitor unix:/run/qemu-monitor,server,nowait -device VGA -display vnc=:0 set -- "$@" -device e1000,netdev=n0 -netdev user,id=n0,"${VM_NET_GUESTFWD_OPTIONS?}","${VM_NET_HOSTFWD_OPTIONS?}","${VM_NET_EXTRA_OPTIONS?}" set -- "$@" -drive file=/var/lib/qemu/image/reactos.qcow2,index=0,media=disk,format=qcow2