From 5d4aecee3e9c94c04b151d3005fa5287610d31e1 Mon Sep 17 00:00:00 2001
From: Karl Vogel <karl.vogel@gmail.com>
Date: Wed, 29 Mar 2017 11:39:35 +0200
Subject: [PATCH] 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>
---
package/network/services/dnsmasq/files/dnsmasq.init | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
}
--
GitLab