diff options
| author | John Crispin <blogic@openwrt.org> | 2014-09-01 13:22:08 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-09-01 13:22:08 +0000 |
| commit | b6847913dbc2b75264fad03342bce4bfa79e2596 (patch) | |
| tree | a7c85bb550b9ba4f8e986a0da47cc41c76100fed | |
| parent | 16ef0d21d097b1c978f913c69c6ebf5e9e37e4cd (diff) | |
| download | upstream-b6847913dbc2b75264fad03342bce4bfa79e2596.tar.gz upstream-b6847913dbc2b75264fad03342bce4bfa79e2596.tar.bz2 upstream-b6847913dbc2b75264fad03342bce4bfa79e2596.zip | |
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>
Backport of r42320
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42390 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 14 |
1 files 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 |