From: John Crispin <john@openwrt.org>
Date: Thu, 28 Aug 2014 06:27:57 +0000 (+0000)
Subject: dnsmasq: Make the --dhcp-host logic easier to understand
X-Git-Tag: reboot~6094
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f65ff468f760b982ab2257c7eb4cee3cff05a28e;p=openwrt%2Fstaging%2Fblogic.git

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@gmail.com>

SVN-Revision: 42320
---

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 06d8c840fb07..942acd7ada06 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -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