From b6847913dbc2b75264fad03342bce4bfa79e2596 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 1 Sep 2014 13:22:08 +0000 Subject: 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 Backport of r42320 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42390 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/services/dnsmasq/files/dnsmasq.init | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 06d8c840fb..942acd7ada 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 -- cgit v1.2.3