aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Vogel <karl.vogel@gmail.com>2017-03-29 11:39:35 +0200
committerHans Dedecker <dedeckeh@gmail.com>2017-03-29 21:04:35 +0200
commit5d4aecee3e9c94c04b151d3005fa5287610d31e1 (patch)
treebb1aa8a03d1e7ad781e8d52178214c9e7d60b195
parent95c333a3b5568a9043afe52de3a5ea8b6a39127f (diff)
downloadupstream-5d4aecee3e9c94c04b151d3005fa5287610d31e1.tar.gz
upstream-5d4aecee3e9c94c04b151d3005fa5287610d31e1.tar.bz2
upstream-5d4aecee3e9c94c04b151d3005fa5287610d31e1.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 1b3157e5e1..5f69be79b4 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -655,7 +655,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
}