twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-02-24 13:30:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add host MAC address as environment variable

Browse Source 
Add host MAC address as environment variable
This commit is contained in:
Kroese 2023-05-29 02:22:55 +02:00 committed by GitHub
commit 1c62acd1a1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/agent.sh
View File

@ -124,7 +124,7 @@ else
fi fi
delay=5000 delay=500
elapsed=$((($(date +%s%N) - ts)/1000000)) elapsed=$((($(date +%s%N) - ts)/1000000))
if [[ delay -gt elapsed ]]; then if [[ delay -gt elapsed ]]; then

6
run/serial.sh
View File

@ -4,6 +4,7 @@ set -Eeuo pipefail
# Docker environment variables # Docker environment variables
: ${HOST_CPU:=''} : ${HOST_CPU:=''}
: ${HOST_MAC:=''}
: ${HOST_BUILD:=''} : ${HOST_BUILD:=''}
: ${HOST_DEBUG:=''} : ${HOST_DEBUG:=''}
: ${HOST_SERIAL:=''} : ${HOST_SERIAL:=''}
@ -26,9 +27,10 @@ else
fi fi
HOST_ARGS=() HOST_ARGS=()
HOST_ARGS+=("-cpu=${CPU_CORES}")
HOST_ARGS+=("-cpu_arch=${HOST_CPU}") 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_BUILD" ] && HOST_ARGS+=("-build=${HOST_BUILD}")
[ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=${HOST_SERIAL}") [ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=${HOST_SERIAL}")
[ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=${GUEST_SERIAL}") [ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=${GUEST_SERIAL}")
@ -41,7 +43,7 @@ if [[ "${HOST_DEBUG}" == [Yy1]* ]]; then
{ set +x; } 2>/dev/null { set +x; } 2>/dev/null
echo echo
else else
./run/host.bin "${HOST_ARGS[@]}" > /dev/null 2>&1 & ./run/host.bin "${HOST_ARGS[@]}" 2> /dev/null &
fi fi
# Configure serial ports # Configure serial ports