From b248fc92cce8cb91f79323b8a90b0f19f024f0af Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 27 May 2023 07:13:43 +0200 Subject: [PATCH 1/4] fix: Don't redirect stdout --- run/serial.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/serial.sh b/run/serial.sh index 72c3db02..9a4c3728 100644 --- a/run/serial.sh +++ b/run/serial.sh @@ -41,7 +41,7 @@ if [[ "${HOST_DEBUG}" == [Yy1]* ]]; then { set +x; } 2>/dev/null echo else - ./run/host.bin "${HOST_ARGS[@]}" > /dev/null 2>&1 & + ./run/host.bin "${HOST_ARGS[@]}" 2> /dev/null & fi # Configure serial ports From 3870683d54e7eaf7e5c3ae7b24fefc903ced246e Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 27 May 2023 13:26:39 +0200 Subject: [PATCH 2/4] fix: Decrease delay --- agent/agent.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/agent.sh b/agent/agent.sh index df7441c3..d83b0377 100644 --- a/agent/agent.sh +++ b/agent/agent.sh @@ -124,7 +124,7 @@ else fi -delay=5000 +delay=500 elapsed=$((($(date +%s%N) - ts)/1000000)) if [[ delay -gt elapsed ]]; then From c178c758ab77381fc071f453727e4bca09ce88fa Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 29 May 2023 02:10:10 +0200 Subject: [PATCH 3/4] feat: Add host MAC address --- run/serial.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/run/serial.sh b/run/serial.sh index 9a4c3728..3f5d0e89 100644 --- a/run/serial.sh +++ b/run/serial.sh @@ -4,6 +4,7 @@ set -Eeuo pipefail # Docker environment variables : ${HOST_CPU:=''} +: ${HOST_MAC:=''} : ${HOST_BUILD:=''} : ${HOST_DEBUG:=''} : ${HOST_SERIAL:=''} @@ -26,9 +27,10 @@ else fi HOST_ARGS=() +HOST_ARGS+=("-cpu=${CPU_CORES}") HOST_ARGS+=("-cpu_arch=${HOST_CPU}") -[ -n "$CPU_CORES" ] && HOST_ARGS+=("-cpu=${CPU_CORES}") +[ -n "$HOST_MAC" ] && HOST_ARGS+=("-mac=${HOST_MAC}") [ -n "$HOST_BUILD" ] && HOST_ARGS+=("-build=${HOST_BUILD}") [ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=${HOST_SERIAL}") [ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=${GUEST_SERIAL}") From 5c68f7a2a28b47e1ac1233aa37de473c9954c874 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 29 May 2023 02:18:33 +0200 Subject: [PATCH 4/4] feat: Add host MAC address --- run/serial.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/serial.sh b/run/serial.sh index 3f5d0e89..8c7030d5 100644 --- a/run/serial.sh +++ b/run/serial.sh @@ -30,7 +30,7 @@ HOST_ARGS=() HOST_ARGS+=("-cpu=${CPU_CORES}") HOST_ARGS+=("-cpu_arch=${HOST_CPU}") -[ -n "$HOST_MAC" ] && HOST_ARGS+=("-mac=${HOST_MAC}") +[ -n "$HOST_MAC" ] && HOST_ARGS+=("-mac=${HOST_MAC//:/-}") [ -n "$HOST_BUILD" ] && HOST_ARGS+=("-build=${HOST_BUILD}") [ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=${HOST_SERIAL}") [ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=${GUEST_SERIAL}")