From e4031ae566ec45d3f9ce6beaaf636ebd425dc23d Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sun, 9 Apr 2023 16:30:17 +0200
Subject: [PATCH] Simplify network code

---
 network.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/network.sh b/network.sh
index acf8a9e..980f42d 100644
--- a/network.sh
+++ b/network.sh
@@ -15,9 +15,9 @@ set -eu
 # ######################################
 
 setupLocalDhcp () {
-  CIDR="24"
-  MAC="$1"
   IP="$2"
+  MAC="$1"
+  CIDR="24"
   HOSTNAME="VirtualDSM"
   # dnsmasq configuration:
   DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-range=$IP,$IP --dhcp-host=$MAC,,$IP,$HOSTNAME,infinite --dhcp-option=option:netmask,255.255.255.0"
@@ -75,9 +75,7 @@ searchdomains=$(grep '^search' /etc/resolv.conf | sed 's/search //' | sed 's/ /,
 domainname=$(echo $searchdomains | awk -F"," '{print $1}')
 
 for nameserver in "${nameservers[@]}"; do
-  if [[ $nameserver =~ .*:.* ]]; then
-    echo "Skipping IPv6 nameserver: $nameserver"
-  else
+  if [ ! [ $nameserver =~ .*:.* ] ]; then
     [[ -z $DNS_SERVERS ]] && DNS_SERVERS=$nameserver || DNS_SERVERS="$DNS_SERVERS,$nameserver"
   fi
 done