From: Karl Vogel <karl.vogel@gmail.com>
Date: Wed, 29 Mar 2017 09:39:35 +0000 (+0200)
Subject: dnsmasq: use logical interface name for dhcp relay config
X-Git-Tag: v17.01.2~18
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=ebf46d2c5bd3c4f1ff80544a134f87131e011056;p=openwrt%2Fopenwrt.git

dnsmasq: use logical interface name for dhcp relay config

The relay section should use the logical interface name and
not the linux network device name directly. This to be
consistent with other sections of the dnsmasq config where
'interface' means the logical interface.

Signed-off-by: Karl Vogel <karl.vogel@gmail.com>
---

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index e811a20d1f..cce7558fc9 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -526,7 +526,8 @@ dhcp_relay_add() {
 	if [ -z "$interface" ]; then
 		xappend "--dhcp-relay=$local_addr,$server_addr"
 	else
-		xappend "--dhcp-relay=$local_addr,$server_addr,$interface"
+		network_get_device ifname "$interface" || return
+		xappend "--dhcp-relay=$local_addr,$server_addr,$ifname"
 	fi
 }