dnsmasq: Make the --dhcp-host logic easier to understand
authorJohn Crispin <john@openwrt.org>
Thu, 28 Aug 2014 06:27:57 +0000 (06:27 +0000)
committerJohn Crispin <john@openwrt.org>
Thu, 28 Aug 2014 06:27:57 +0000 (06:27 +0000)
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@gmail.com>
SVN-Revision: 42320

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

index 06d8c84..942acd7 100644 (file)
@@ -299,14 +299,16 @@ dhcp_host_add() {
        }
 
        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