From 9202a12592ec63a6f288553627b0e2725e214c64 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:28:17 +0100
Subject: [PATCH] fix: Convert dashes in custom MAC addresses (#25)

---
 src/config.sh  | 2 +-
 src/network.sh | 5 +++--
 src/reset.sh   | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/config.sh b/src/config.sh
index 0f35121..57749fd 100644
--- a/src/config.sh
+++ b/src/config.sh
@@ -10,7 +10,7 @@ SERIAL_OPTS="-serial $SERIAL"
 USB_OPTS="-device $USB -device usb-kbd -device usb-tablet"
 RAM_OPTS=$(echo "-m $RAM_SIZE" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
-MON_OPTS="-monitor $MONITOR -name ${APP,,// /-},process=${APP,,// /-},debug-threads=on"
+MON_OPTS="-monitor $MONITOR -name $PROCESS,process=$PROCESS,debug-threads=on"
 MAC_OPTS="-machine type=${MACHINE},secure=off,dump-guest-core=off${KVM_OPTS}"
 DEV_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
 DEV_OPTS="$DEV_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
diff --git a/src/network.sh b/src/network.sh
index 4c2e607..bedb84d 100644
--- a/src/network.sh
+++ b/src/network.sh
@@ -83,7 +83,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
@@ -243,7 +243,8 @@ getInfo() {
     MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
   fi
 
-  VM_NET_MAC="${MAC,,//-/:}"
+  VM_NET_MAC="${MAC^^}"
+  VM_NET_MAC="${VM_NET_MAC//-/:}"
 
   if [[ ${#VM_NET_MAC} == 12 ]]; then
     m="$VM_NET_MAC"
diff --git a/src/reset.sh b/src/reset.sh
index 9b1b85e..5c56d60 100644
--- a/src/reset.sh
+++ b/src/reset.sh
@@ -29,6 +29,9 @@ echo
 
 # Helper variables
 
+PROCESS="${APP,,}"
+PROCESS="${PROCESS// /-}"
+
 STORAGE="/storage"
 INFO="/run/shm/msg.html"
 PAGE="/run/shm/index.html"