From: Michael Prokop <mika@grml.org>
Date: Wed, 17 Aug 2022 11:51:55 +0000 (+0200)
Subject: Fix iprange usage when configuring DHCP clients
X-Git-Tag: v0.104.0~1
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=bc3bf205e69f9528e72d1b2470631c2b9f8ff110

Fix iprange usage when configuring DHCP clients

This seems to have been broken ever since it was integrated and
nobody bothered to look into it since then :-/
---

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 5f2f3fd..2140d69 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -168,10 +168,10 @@ for addresses from 192.168.0.101 to (and including) 192.168.0.200.
 
   IPRANGE_FROM_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/HostMin/{print $2}'`
   # if we have x.x.x.1 as starting range address provide
-  # x.x.x.10 instead so we avoid possible conflicts with
+  # x.x.x.100 instead so we avoid possible conflicts with
   # default gateway
-  if echo $IPFROM | grep -c '\.1$' ; then
-    IPFROM="${IPFROM%%\.1}.10"
+  if echo "$IPRANGE_FROM_" | grep -q '\.1$' ; then
+    IPRANGE_FROM_="${IPRANGE_FROM_%%\.1}.100"
   fi
   IPRANGE_TO_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/HostMax/{print $2}'`
   NETWORK_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/Network:/{print $2}'`