Add host MAC address as environment variable

vdsm · May 29, 2023 · aaba184 · aaba184
2 parents 7b7c3eb + 5c68f7a
commit aaba184
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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

diff --git 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}")
@@ -41,7 +43,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