Merge pull request #147 from sickcodes/vmxnet3

Add -e NETWORKING=e1000-82545em || -e NETWORKING=vmxnet3 as runtime arguments.
This commit is contained in:
sickcodes 2021-02-08 22:21:44 +00:00 committed by GitHub
commit cf391bbf90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -178,7 +178,8 @@ RUN touch Launch.sh \
&& tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \ && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \
&& tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=qcow2 \' \ && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=qcow2 \' \
&& tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \ && tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \
&& tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900, -device e1000-82545em,netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \ && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900, \' \
&& tee -a Launch.sh <<< '-device ${NETWORKING:-e1000-82545em},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
&& tee -a Launch.sh <<< '-monitor stdio \' \ && tee -a Launch.sh <<< '-monitor stdio \' \
&& tee -a Launch.sh <<< '-vga vmware \' \ && tee -a Launch.sh <<< '-vga vmware \' \
&& tee -a Launch.sh <<< '${EXTRA:-}' && tee -a Launch.sh <<< '${EXTRA:-}'
@ -196,6 +197,9 @@ ENV DISPLAY=:0.0
ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
ENV NETWORKING=e1000-82545em
# ENV NETWORKING=vmxnet3
VOLUME ["/tmp/.X11-unix"] VOLUME ["/tmp/.X11-unix"]
CMD case "$(file --brief /image)" in \ CMD case "$(file --brief /image)" in \

View File

@ -622,6 +622,7 @@ docker run \
-e IMAGE_PATH=/image \ -e IMAGE_PATH=/image \
-e SCREEN_SHARE_PORT=5900 \ -e SCREEN_SHARE_PORT=5900 \
-e DISPLAY=:0 \ -e DISPLAY=:0 \
-e NETWORKING=vmxnet3 \
--device /dev/kvm \ --device /dev/kvm \
--device /dev/snd \ --device /dev/snd \
-v /tmp/.X11-unix:/tmp/.X11-unix \ -v /tmp/.X11-unix:/tmp/.X11-unix \