From: Hans Dedecker Date: Thu, 4 May 2017 20:33:37 +0000 (+0200) Subject: dnsmasq: fix dhcp_option usage warning X-Git-Tag: v18.06.0-rc1~3004 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=cd5cd7c859660a52a09d6744a4343e3078a8c883 dnsmasq: fix dhcp_option usage warning Don't display unnecessary dhcp_option usage warning in case dhcp_option is empty Signed-off-by: Hans Dedecker --- diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 4291df2544..e6ba7322e3 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -560,9 +560,10 @@ dhcp_option_add() { if [ -n "$list_len" ]; then config_list_foreach "$cfg" dhcp_option dhcp_option_append "$networkid" "$force" else - echo "Warning: the 'option dhcp_option' syntax is deprecated, use 'list dhcp_option'" >&2 config_get dhcp_option "$cfg" dhcp_option + [ -n "$dhcp_option" ] && echo "Warning: the 'option dhcp_option' syntax is deprecated, use 'list dhcp_option'" >&2 + local option for option in $dhcp_option; do dhcp_option_append "$option" "$networkid" "$force"