From f74771a9cce48f3c10a61a834a4e0a441b86f323 Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 8 Feb 2024 17:33:11 +0100 Subject: [PATCH] fix: Convert MAC address to uppercase (#627) --- src/network.sh | 4 ++-- src/power.sh | 3 --- src/reset.sh | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/network.sh b/src/network.sh index fd4588e..7831416 100644 --- a/src/network.sh +++ b/src/network.sh @@ -82,7 +82,7 @@ configureDNS() { DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1 --dhcp-option=option:router,${VM_NET_IP%.*}.1" # Add DNS entry for container - DNSMASQ_OPTS="$DNSMASQ_OPTS --address=/host.local/${VM_NET_IP%.*}.1" + DNSMASQ_OPTS="$DNSMASQ_OPTS --address=/host.lan/${VM_NET_IP%.*}.1" DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//') [[ "$DEBUG" == [Yy1]* ]] && set -x @@ -216,7 +216,7 @@ getInfo() { VM_NET_MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:11:32:\3:\4:\5/') fi - VM_NET_MAC="${VM_NET_MAC,,}" + VM_NET_MAC="${VM_NET_MAC^^}" VM_NET_MAC="${VM_NET_MAC//-/:}" if [[ ${#VM_NET_MAC} == 12 ]]; then diff --git a/src/power.sh b/src/power.sh index 7757009..79d2600 100644 --- a/src/power.sh +++ b/src/power.sh @@ -166,9 +166,6 @@ _graceful_shutdown() { finish "$code" && return "$code" } -PROCESS="${APP,,}" -PROCESS="${PROCESS// /-}" - MON_OPTS="\ -pidfile $QEMU_PID \ -name $PROCESS,process=$PROCESS,debug-threads=on \ diff --git a/src/reset.sh b/src/reset.sh index 2d0483f..f7b8639 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -28,6 +28,9 @@ echo # Helper variables +PROCESS="${APP,,}" +PROCESS="${PROCESS// /-}" + STORAGE="/storage" INFO="/run/shm/msg.html" PAGE="/run/shm/index.html"