From 13eae241ec7f31a174b5856cbb181d10ed63dd1d Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 22 Apr 2023 20:17:05 +0200
Subject: [PATCH 1/5] Mimic VMM options better

---
 run/run.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/run/run.sh b/run/run.sh
index 5fabd17..561790c 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -56,11 +56,14 @@ if [ -z "${KVM_OPTS}" ]; then
   [ "$DEBUG" != "Y" ] && exit 88
 fi
 
-DEF_OPTS="-nographic -nodefaults"
-KVM_OPTS="-machine type=q35,usb=off${KVM_OPTS}"
+DEF_OPTS="-name dsm -nographic -nodefaults -boot strict=on -display none"
 RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
-CPU_OPTS="-smp ${CPU_CORES},sockets=1,cores=${CPU_CORES},threads=1"
-EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0"
+CPU_OPTS="-smp ${CPU_CORES},sockets=1,dies=1,cores=${CPU_CORES},threads=1"
+KVM_OPTS="-machine type=q35,usb=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
+
+EXTRA_OPTS="device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
+EXTRA_OPTS="$EXTRA_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
+EXTRA_OPTS="$EXTRA_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c
 
 ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}"
 ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')

From 9cb4dbea4b2775df84299e09004034d46d8ae5e0 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 22 Apr 2023 20:19:00 +0200
Subject: [PATCH 2/5] Mimic VMM options better

---
 run/run.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/run/run.sh b/run/run.sh
index 561790c..fba7d66 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -60,10 +60,9 @@ DEF_OPTS="-name dsm -nographic -nodefaults -boot strict=on -display none"
 RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 CPU_OPTS="-smp ${CPU_CORES},sockets=1,dies=1,cores=${CPU_CORES},threads=1"
 KVM_OPTS="-machine type=q35,usb=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
-
 EXTRA_OPTS="device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
 EXTRA_OPTS="$EXTRA_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
-EXTRA_OPTS="$EXTRA_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c
+EXTRA_OPTS="$EXTRA_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
 
 ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}"
 ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')

From 482015373d36efc9d1d3a2548fccbbbf4785c299 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 22 Apr 2023 20:22:38 +0200
Subject: [PATCH 3/5] Mimic VMM options better

---
 run/run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run/run.sh b/run/run.sh
index fba7d66..f63c39a 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -56,11 +56,11 @@ if [ -z "${KVM_OPTS}" ]; then
   [ "$DEBUG" != "Y" ] && exit 88
 fi
 
-DEF_OPTS="-name dsm -nographic -nodefaults -boot strict=on -display none"
+DEF_OPTS="-nographic -nodefaults -boot strict=on -display none"
 RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 CPU_OPTS="-smp ${CPU_CORES},sockets=1,dies=1,cores=${CPU_CORES},threads=1"
 KVM_OPTS="-machine type=q35,usb=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
-EXTRA_OPTS="device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
+EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
 EXTRA_OPTS="$EXTRA_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
 EXTRA_OPTS="$EXTRA_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
 

From eb16001d9c13669c4f62a1a288d1d4a89ae2ee34 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 22 Apr 2023 20:29:05 +0200
Subject: [PATCH 4/5] Spacing

---
 run/network.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run/network.sh b/run/network.sh
index 1a35131..80ef146 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -187,7 +187,7 @@ if [ "$DEBUG" = "Y" ]; then
 
   IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
   echo "Info: Container IP is ${IP} with gateway ${GATEWAY}" && echo
-  ifconfig && echo
+  ifconfig
   ip route && echo
 
 fi

From 98a17cfac42450d32eb3e42f9e938878ce34a0a2 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 22 Apr 2023 20:29:41 +0200
Subject: [PATCH 5/5] Display IP

---
 run/check.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/run/check.sh b/run/check.sh
index cdc99ca..b721717 100644
--- a/run/check.sh
+++ b/run/check.sh
@@ -14,6 +14,7 @@ fi
 IP=$(cat "${FILE}")
 
 if ! curl -m 3 -ILfSs "http://${IP}:${PORT}/" > /dev/null; then
+  echo "Failed to reach ${IP}:${PORT}"
   exit 1
 fi