Unverified Commit 17a65881 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Convert dashes in custom MAC addresses (#438)

parent eb950669

src/config.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ SERIAL_OPTS="-serial $SERIAL" 
USB_OPTS="-device $USB -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},graphics=off,vmport=off,dump-guest-core=off,hpet=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"

src/network.sh

+3 −2
Original line number Diff line number Diff line
@@ -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"

src/reset.sh

+4 −1
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ echo 


# Helper variables



PROCESS="${APP,,}"

PROCESS="${PROCESS// /-}"



STORAGE="/storage"

INFO="/run/shm/msg.html"

PAGE="/run/shm/index.html"