From 199c5029037e060c8184e957861447cf1dcc3270 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 16 Feb 2025 21:33:37 +0100
Subject: [PATCH] Remove non used DATA array from create_network_ini

---
 sbin/create_network_ini | 35 +++++------------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/sbin/create_network_ini b/sbin/create_network_ini
index 0240f887d..0c1459f8b 100755
--- a/sbin/create_network_ini
+++ b/sbin/create_network_ini
@@ -14,6 +14,7 @@
 
 INI=/var/local/emhttp/network.ini.new
 CFG=/boot/config/network.cfg
+SYS=/sys/class/net
 
 declare -A VLANID USE_DHCP IPADDR NETMASK GATEWAY METRIC USE_DHCP6 IPADDR6 NETMASK6 GATEWAY6 PRIVACY6 METRIC6 DESCRIPTION PROTOCOL
 
@@ -47,8 +48,6 @@ else
 fi
 # prepare empty file
 echo -n >$INI
-# clear update information
-DATA=
 
 # loop thru all defined interfaces (=1 in case of legacy)
 for ((i=0; i<${SYSNICS:-1}; i++)); do
@@ -129,14 +128,6 @@ for ((i=0; i<${SYSNICS:-1}; i++)); do
     echo "NETMASK:0=\"$(mask ${NET[1]})\"" >>$INI
     echo "GATEWAY:0=\"$GW\"" >>$INI
     echo "METRIC:0=\"${METRIC[$i]}\"" >>$INI
-    DATA="${DATA}${ETH}_I_IPADDR:0=${NET[0]} ${ETH}_S_NETMASK:0=$(mask ${NET[1]}) ${ETH}_I_GATEWAY:0=$GW "
-    if [[ $i -eq 0 && -n $DNS4 ]]; then
-      x=1
-      for SERVER in $DNS4; do
-        DATA="${DATA}${ETH}_I_DNS-SERVER${x}=$SERVER "
-        ((x++))
-      done
-    fi
   else
     # get static assigned ipv4 address & mask
     echo "IPADDR:0=\"${IPADDR[$i]}\"" >>$INI
@@ -154,14 +145,6 @@ for ((i=0; i<${SYSNICS:-1}; i++)); do
     echo "GATEWAY6:0=\"$GW6\"" >>$INI
     echo "METRIC6:0=\"${METRIC6[$i]}\"" >>$INI
     echo "PRIVACY6:0=\"${PRIVACY6[$i]}\"" >>$INI
-    DATA="${DATA}${ETH}_I_IPADDR6:0=${NET6[0]} ${ETH}_I_NETMASK6:0=${NET6[1]} ${ETH}_I_GATEWAY6:0=$GW6 "
-    if [[ $i -eq 0 && -n $DNS6 ]]; then
-      x=1
-      for SERVER6 in $DNS6; do
-        DATA="${DATA}${ETH}_I_DNS6-SERVER${x}=$SERVER6 "
-        ((x++))
-      done
-    fi
   else
     # get static assigned ipv6 address & prefix
     echo "IPADDR6:0=\"${IPADDR6[$i]}\"" >>$INI
@@ -188,7 +171,6 @@ for ((i=0; i<${SYSNICS:-1}; i++)); do
         echo "NETMASK:$j=\"$(mask ${NET[1]})\"" >>$INI
         echo "GATEWAY:$j=\"$GW\"" >>$INI
         echo "METRIC:$j=\"${METRIC[$i,$j]}\"" >>$INI
-        DATA="${DATA}${ETH}_I_IPADDR:$j=${NET[0]} ${ETH}_S_NETMASK:$j=$(mask ${NET[1]}) ${ETH}_I_GATEWAY:$j=$GW "
       else
         # get static assigned ipv4 address & mask
         echo "IPADDR:$j=\"${IPADDR[$i,$j]}\"" >>$INI
@@ -207,7 +189,6 @@ for ((i=0; i<${SYSNICS:-1}; i++)); do
         echo "GATEWAY6:$j=\"$GW6\"" >>$INI
         echo "METRIC6:$j=\"${METRIC6[$i,$j]}\"" >>$INI
         echo "PRIVACY6:$j=\"${PRIVACY6[$i,$j]}\"" >>$INI
-        DATA="${DATA}${ETH}_I_IPADDR6:$j=${NET6[0]} ${ETH}_I_NETMASK6:$j=${NET6[1]} ${ETH}_I_GATEWAY6:$j=$GW6 "
       else
         # get static assigned ipv6 address & prefix
         echo "IPADDR6:$j=\"${IPADDR6[$i,$j]}\"" >>$INI
@@ -227,27 +208,21 @@ mv $INI ${INI%.*}
 
 log "interface=${interface:-$1}, reason=$reason, protocol=$protocol"
 # delayed execution
-[[ $reason == EXPIRE ]] && DELAY=15 || DELAY=45
-/usr/local/emhttp/webGui/scripts/update_services $DELAY
-
-# send update information
-if [[ -n $DATA && -e /var/run/nginx.socket ]]; then
-  curl -sfd "$DATA" --unix-socket /var/run/nginx.socket http://localhost/pub/dhcp?buffer_length=1 >/dev/null 2>&1
-fi
+/usr/local/emhttp/webGui/scripts/update_services 20
 
 # generate our welcome text (management interface only)
 if [[ -z $interface || "eth0 br0 bond0 wlan0" =~ $interface ]]; then
   . /etc/unraid-version
   echo -e "Unraid Server OS version: $version" >/etc/issue
   # find management interface
-  [[ -e /sys/class/net/bond0 ]] && dev=bond0 || dev=eth0
-  [[ -e /sys/class/net/br0 ]] && dev=br0
+  [[ -e $SYS/bond0 ]] && dev=bond0 || dev=eth0
+  [[ -e $SYS/br0 ]] && dev=br0
   IPv4=$(ip -4 -br addr show $dev scope global | sed -r 's/\/[0-9]+//g' | awk '{print $3;exit}')
   IPv6=$(ip -6 -br addr show $dev scope global -temporary -deprecated | sed -r 's/\/[0-9]+//g' | awk '{print $3;exit}')
   # show current IP assignment
   [[ -n $IPv4 ]] && echo " IPv4 address: $IPv4" >>/etc/issue || echo " IPv4 address: not set" >>/etc/issue
   [[ -n $IPv6 ]] && echo " IPv6 address: $IPv6" >>/etc/issue || echo " IPv6 address: not set" >>/etc/issue
-  if [[ -e /sys/class/net/wlan0 ]]; then
+  if [[ -e $SYS/wlan0 ]]; then
     echo "Wireless network:" >>/etc/issue
     IPv4=$(ip -4 -br addr show wlan0 scope global | sed -r 's/\/[0-9]+//g' | awk '{print $3;exit}')
     IPv6=$(ip -6 -br addr show wlan0 scope global -temporary -deprecated | sed -r 's/\/[0-9]+//g' | awk '{print $3;exit}')