Changeset 42320

Timestamp:

2014-08-28T08:27:57+02:00 (3 years ago)

Author:

blogic

Message:

dnsmasq: Make the --dhcp-host logic easier to understand

Use an if/else statement to cover the two different syntaxes. Add
comments explaining what the end results should look like.

This patch should not change the script's output.

Signed-off-by: Kevin Cernekee <cernekee@…>

File:

• trunk/package/network/services/dnsmasq/files/dnsmasq.init (modified) (1 diff)

trunk/package/network/services/dnsmasq/files/dnsmasq.init

@@ -300 +300 @@
 
         config_get mac "$cfg" mac
-        [ -z "$mac" ] && {
+        if [ -n "$mac" ]; then
+                # --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap
+                macs=""
+                for m in $mac; do append macs "$m" ","; done
+        else
+                # --dhcp-host=lap,192.168.0.199
                 [ -n "$name" ] || return 0
-                mac="$name"
+                macs="$name"
                 name=""
-        }
-
-        macs=""
-        for m in $mac; do append macs "$m" ","; done
+        fi
 
         config_get tag "$cfg" tag