aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Vogel <karl.vogel@gmail.com>2017-03-29 11:39:35 +0200
committerJo-Philipp Wich <jo@mein.io>2017-06-02 00:07:02 +0200
commitebf46d2c5bd3c4f1ff80544a134f87131e011056 (patch)
treefe5daee96012e805d9778763ad586846f9427b17
parent78edfff5303533dc52a1ac64ad745acc0a8a743e (diff)
downloadupstream-ebf46d2c5bd3c4f1ff80544a134f87131e011056.tar.gz
upstream-ebf46d2c5bd3c4f1ff80544a134f87131e011056.tar.bz2
upstream-ebf46d2c5bd3c4f1ff80544a134f87131e011056.zip
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>
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init3
1 files changed, 2 insertions, 1 deletions
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
}